Skip to content

Commit

Permalink
Merge branch 'master-local' into master-dist
Browse files Browse the repository at this point in the history
  • Loading branch information
patternfly-build committed Nov 14, 2018
2 parents e5f769e + dd5f0b0 commit 4ffb3e1
Show file tree
Hide file tree
Showing 25 changed files with 250 additions and 6 deletions.
6 changes: 6 additions & 0 deletions backstop/config/scenarios/hint-block.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = [{
removeSelectors: ['.page-header + .alert'],
label: 'hint-block',
url: 'dist/tests/hint-block.html',
disabled: false
}]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions dist/css/patternfly-additions.css
Original file line number Diff line number Diff line change
Expand Up @@ -4338,6 +4338,25 @@ fieldset[disabled] .btn-experimental-pf.active {
right: 0;
z-index: 1030;
}
.hint-block-pf {
background-color: #def3ff;
color: #004368;
padding: 10px 15px 15px;
}
.hint-block-pf .hint-block-pf-title {
font-size: 16px;
font-weight: 500;
line-height: 1.1;
margin-bottom: 10px;
}
.hint-block-pf .hint-block-pf-body {
font-size: 13px;
font-weight: 300;
line-height: 1.4;
}
.hint-block-pf > .btn {
margin-top: 30px;
}
@font-face {
font-family: "PatternFlyIcons-webfont";
src: url("../fonts/PatternFlyIcons-webfont.eot");
Expand Down
2 changes: 1 addition & 1 deletion dist/css/patternfly-additions.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/patternfly-additions.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/patternfly-additions.min.css.map

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions dist/css/rcue-additions.css
Original file line number Diff line number Diff line change
Expand Up @@ -4339,6 +4339,25 @@ fieldset[disabled] .btn-experimental-pf.active {
right: 0;
z-index: 1030;
}
.hint-block-pf {
background-color: #def3ff;
color: #004368;
padding: 10px 15px 15px;
}
.hint-block-pf .hint-block-pf-title {
font-size: 16px;
font-weight: 500;
line-height: 1.1;
margin-bottom: 10px;
}
.hint-block-pf .hint-block-pf-body {
font-size: 13px;
font-weight: 300;
line-height: 1.4;
}
.hint-block-pf > .btn {
margin-top: 30px;
}
@font-face {
font-family: "PatternFlyIcons-webfont";
src: url("../fonts/PatternFlyIcons-webfont.eot");
Expand Down
2 changes: 1 addition & 1 deletion dist/css/rcue-additions.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/rcue-additions.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/rcue-additions.min.css.map

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions dist/less/hint-block.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.hint-block-pf {
background-color: @color-pf-blue-50;
color: @color-pf-blue-600;
padding: 10px 15px 15px;
.hint-block-pf-title {
font-size: 16px;
font-weight: 500;
line-height: 1.1;
margin-bottom: 10px;
}
.hint-block-pf-body {
font-size: 13px;
font-weight: 300;
line-height: 1.4;
}
> .btn {
margin-top: 30px;
}
}
1 change: 1 addition & 0 deletions dist/less/patternfly-additions.less
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
@import "experimental-features.less";
@import "filter.less";
@import "footer.less";
@import "hint-block.less";
@import "icons.less";
@import "infotip.less";
@import "layouts.less";
Expand Down
1 change: 1 addition & 0 deletions dist/sass/_patternfly.scss
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
@import 'patternfly/filter';
@import 'patternfly/footer';
@import 'patternfly/icons';
@import 'patternfly/hint-block';
@import 'patternfly/infotip';
@import 'patternfly/layouts';
@import 'patternfly/links';
Expand Down
19 changes: 19 additions & 0 deletions dist/sass/patternfly/_hint-block.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.hint-block-pf {
background-color: $color-pf-blue-50;
color: $color-pf-blue-600;
padding: 10px 15px 15px;
.hint-block-pf-title {
font-size: 16px;
font-weight: 500;
line-height: 1.1;
margin-bottom: 10px;
}
.hint-block-pf-body {
font-size: 13px;
font-weight: 300;
line-height: 1.4;
}
> .btn {
margin-top: 30px;
}
}
19 changes: 19 additions & 0 deletions dist/sass/rcue/_hint-block.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.hint-block-pf {
background-color: $color-pf-blue-50;
color: $color-pf-blue-600;
padding: 10px 15px 15px;
.hint-block-pf-title {
font-size: 16px;
font-weight: 500;
line-height: 1.1;
margin-bottom: 10px;
}
.hint-block-pf-body {
font-size: 13px;
font-weight: 300;
line-height: 1.4;
}
> .btn {
margin-top: 30px;
}
}
1 change: 1 addition & 0 deletions dist/sass/rcue/_patternfly-additions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
@import 'experimental-features';
@import 'filter';
@import 'footer';
@import 'hint-block';
@import 'icons';
@import 'infotip';
@import 'layouts';
Expand Down
59 changes: 59 additions & 0 deletions dist/tests/hint-block.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<!DOCTYPE html>
<!--[if IE 9]><html lang="en-us" class="ie9"><![endif]-->
<!--[if gt IE 9]><!-->
<html lang="en-us">
<!--<![endif]-->
<head>
<title>Hint Block - PatternFly</title>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="../img/favicon.ico">
<!-- iPad retina icon -->
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="../img/apple-touch-icon-precomposed-152.png">
<!-- iPad retina icon (iOS < 7) -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../img/apple-touch-icon-precomposed-144.png">
<!-- iPad non-retina icon -->
<link rel="apple-touch-icon-precomposed" sizes="76x76" href="../img/apple-touch-icon-precomposed-76.png">
<!-- iPad non-retina icon (iOS < 7) -->
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../img/apple-touch-icon-precomposed-72.png">
<!-- iPhone 6 Plus icon -->
<link rel="apple-touch-icon-precomposed" sizes="120x120" href="../img/apple-touch-icon-precomposed-180.png">
<!-- iPhone retina icon (iOS < 7) -->
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../img/apple-touch-icon-precomposed-114.png">
<!-- iPhone non-retina icon (iOS < 7) -->
<link rel="apple-touch-icon-precomposed" sizes="57x57" href="../img/apple-touch-icon-precomposed-57.png">
<link rel="stylesheet" href="../css/patternfly.min.css" >
<link rel="stylesheet" href="../css/patternfly-additions.min.css" >
<link href="tests.css" rel="stylesheet" media="screen, print">
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="../js/patternfly.min.js"></script>
</head>

<body>
<div class="container">
<div class="page-header">
<h1>Hint Block</h1>
</div>
<div class="alert alert-warning">
<span class="pficon pficon-warning-triangle-o"></span>
These examples are included for development testing purposes. For official documentation, see <a href="https://www.patternfly.org" class="alert-link">https://www.patternfly.org</a> and <a href="http://getbootstrap.com" class="alert-link">http://getbootstrap.com</a>.
</div>
<hr>
<div class="hint-block-pf">
<button type="button" class="close" aria-hidden="true" aria-label="Close">
<span class="pficon pficon-close"></span>
</button>
<div class="hint-block-pf-title">Some Title</div>
<div class="hint-block-pf-body">
Something introductory. Some body text explaining the feature. Some body text explaining the feature. Some body text explaining the feature. Some body text explaining the feature. Some body text explaining the feature. Some body text explaining the feature.
</div>
<button class="btn btn-primary" type="button">
Optional Action
</button>
</div>

</div><!-- /container -->
</body>
</html>
3 changes: 3 additions & 0 deletions dist/tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ <h2>Widgets</h2>
<li>
<a href="forms.html">Forms</a>
</li>
<li>
<a href="hint-block.html">Hint Block</a>
</li>
<li>
<a href="icons.html">Icons</a>
</li>
Expand Down
19 changes: 19 additions & 0 deletions src/less/hint-block.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.hint-block-pf {
background-color: @color-pf-blue-50;
color: @color-pf-blue-600;
padding: 10px 15px 15px;
.hint-block-pf-title {
font-size: 16px;
font-weight: 500;
line-height: 1.1;
margin-bottom: 10px;
}
.hint-block-pf-body {
font-size: 13px;
font-weight: 300;
line-height: 1.4;
}
> .btn {
margin-top: 30px;
}
}
1 change: 1 addition & 0 deletions src/less/patternfly-additions.less
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
@import "experimental-features.less";
@import "filter.less";
@import "footer.less";
@import "hint-block.less";
@import "icons.less";
@import "infotip.less";
@import "layouts.less";
Expand Down
19 changes: 19 additions & 0 deletions src/sass/converted/patternfly/_hint-block.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.hint-block-pf {
background-color: $color-pf-blue-50;
color: $color-pf-blue-600;
padding: 10px 15px 15px;
.hint-block-pf-title {
font-size: 16px;
font-weight: 500;
line-height: 1.1;
margin-bottom: 10px;
}
.hint-block-pf-body {
font-size: 13px;
font-weight: 300;
line-height: 1.4;
}
> .btn {
margin-top: 30px;
}
}
19 changes: 19 additions & 0 deletions src/sass/converted/rcue/_hint-block.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.hint-block-pf {
background-color: $color-pf-blue-50;
color: $color-pf-blue-600;
padding: 10px 15px 15px;
.hint-block-pf-title {
font-size: 16px;
font-weight: 500;
line-height: 1.1;
margin-bottom: 10px;
}
.hint-block-pf-body {
font-size: 13px;
font-weight: 300;
line-height: 1.4;
}
> .btn {
margin-top: 30px;
}
}
1 change: 1 addition & 0 deletions src/sass/converted/rcue/_patternfly-additions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
@import 'experimental-features';
@import 'filter';
@import 'footer';
@import 'hint-block';
@import 'icons';
@import 'infotip';
@import 'layouts';
Expand Down
1 change: 1 addition & 0 deletions src/sass/static/_patternfly.scss
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
@import 'patternfly/filter';
@import 'patternfly/footer';
@import 'patternfly/icons';
@import 'patternfly/hint-block';
@import 'patternfly/infotip';
@import 'patternfly/layouts';
@import 'patternfly/links';
Expand Down
18 changes: 18 additions & 0 deletions tests/pages/hint-block.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
categories: [Widgets]
layout: page
title: Hint Block
resource: true
---
<div class="hint-block-pf">
<button type="button" class="close" aria-hidden="true" aria-label="Close">
<span class="pficon pficon-close"></span>
</button>
<div class="hint-block-pf-title">Some Title</div>
<div class="hint-block-pf-body">
Something introductory. Some body text explaining the feature. Some body text explaining the feature. Some body text explaining the feature. Some body text explaining the feature. Some body text explaining the feature. Some body text explaining the feature.
</div>
<button class="btn btn-primary" type="button">
Optional Action
</button>
</div>

0 comments on commit 4ffb3e1

Please sign in to comment.