Skip to content

Commit

Permalink
Merge pull request #39 from patternfly/bump-v3.6.0
Browse files Browse the repository at this point in the history
Bumped version number to 3.6.0.
  • Loading branch information
dlabrecq authored Jul 12, 2016
2 parents 037a0f7 + b1fa695 commit 4bd784c
Show file tree
Hide file tree
Showing 16 changed files with 194 additions and 28 deletions.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rcue",
"version": "3.5.1",
"version": "3.6.0",
"authors": "Red Hat",
"license": "Apache-2.0",
"homepage": "http://rcue-uxd.itos.redhat.com/",
Expand All @@ -18,7 +18,7 @@
"rcue.spec.in"
],
"dependencies": {
"patternfly": "~3.5.1"
"patternfly": "~3.6.0"
},
"private": true
}
64 changes: 52 additions & 12 deletions dist/css/rcue-additions.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

44 changes: 44 additions & 0 deletions less/lib/patternfly/about-modal.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
//
// About Modal
// --------------------------------------------------

.about-modal-pf {
background-color: @color-pf-black-900;
background-image: url("@{img-path}/@{modal-about-pf-bg-img}");
background-position: right bottom;
background-repeat: no-repeat;
background-size: 216px auto;
@media (min-width: @screen-sm-min) {
background-size: auto;
}
.modal-body {
color: @color-pf-white;
padding-bottom: 16px;
padding-left: @grid-gutter-width;
padding-right: @grid-gutter-width;
@media (min-width: @screen-sm-min) {
padding-left: (@grid-gutter-width * 2);
padding-right: (@grid-gutter-width * 2);
}
}
.modal-header {
background-color: transparent;
}
.pficon-close {
color: @color-pf-white;
}
}

.product-versions-pf {
margin-bottom: 30px;
margin-top: 30px;
li {
strong {
margin-right: (@grid-gutter-width / 4);
}
}
}

.trademark-pf {
font-size: ceil((@font-size-base - 1));
}
6 changes: 3 additions & 3 deletions less/lib/patternfly/navbar-alt.less
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
.caret,
.fa,
.glyphicon,
.pf-icon {
.pficon {
color: @navbar-pf-alt-active-color;
}
}
Expand All @@ -62,7 +62,7 @@

.caret,
.fa,
.pf-icon {
.pficon {
color: @navbar-pf-alt-color;
font-size: (@font-size-base + 4);
}
Expand All @@ -82,7 +82,7 @@

.caret,
.fa,
.pf-icon {
.pficon {
color: @navbar-pf-alt-active-color;
}
}
Expand Down
6 changes: 3 additions & 3 deletions less/lib/patternfly/navbar-vertical.less
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
.caret,
.fa,
.glyphicon,
.pf-icon {
.pficon {
color: @navbar-pf-vertical-active-color;
}
}
Expand All @@ -59,7 +59,7 @@

.caret,
.fa,
.pf-icon {
.pficon {
color: @navbar-pf-vertical-color;
font-size: (@font-size-base + 4);
}
Expand All @@ -79,7 +79,7 @@

.caret,
.fa,
.pf-icon {
.pficon {
color: @navbar-pf-vertical-active-color;
}
}
Expand Down
3 changes: 2 additions & 1 deletion less/lib/patternfly/patternfly-additions.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

@import "variables.less";
@import "mixins.less";
@import "about-modal.less";
@import "blank-slate.less";
@import "bootstrap-combobox.less";
@import "bootstrap-datepicker.less";
Expand Down Expand Up @@ -53,4 +54,4 @@
@import "time-picker.less";
@import "toast.less";
@import "toolbar.less";
@import "vertical-nav.less";
@import "vertical-nav.less";
1 change: 1 addition & 0 deletions less/lib/patternfly/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
@list-group-top-border: @color-pf-black-200;
@login-bg-color: @color-pf-black;
@login-container-bg-color-rgba: fade(@color-pf-white, 5.5%);
@modal-about-pf-bg-img: "bg-modal-about-pf.png";
@modal-title-padding-horizontal: 18px;
@modal-title-padding-vertical: 10px;
@navbar-pf-active-color: @color-pf-black-150;
Expand Down
2 changes: 1 addition & 1 deletion npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rcue",
"version": "3.5.1",
"version": "3.6.0",
"author": "Red Hat",
"license": "Apache-2.0",
"devDependencies": {
Expand Down
77 changes: 77 additions & 0 deletions tests/about-modal.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<!DOCTYPE html>
<!--[if IE 9]><html lang="en-us" class="ie9"><![endif]-->
<!--[if gt IE 9]><!-->
<html lang="en-us">
<!--<![endif]-->
<head>
<title>About Modal - Red Hat&reg; Common User Experience</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="../dist/img/favicon.ico">
<!-- iPad retina icon -->
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="../dist/img/apple-touch-icon-precomposed-152.png">
<!-- iPad retina icon (iOS < 7) -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../dist/img/apple-touch-icon-precomposed-144.png">
<!-- iPad non-retina icon -->
<link rel="apple-touch-icon-precomposed" sizes="76x76" href="../dist/img/apple-touch-icon-precomposed-76.png">
<!-- iPad non-retina icon (iOS < 7) -->
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../dist/img/apple-touch-icon-precomposed-72.png">
<!-- iPhone 6 Plus icon -->
<link rel="apple-touch-icon-precomposed" sizes="120x120" href="../dist/img/apple-touch-icon-precomposed-180.png">
<!-- iPhone retina icon (iOS < 7) -->
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../dist/img/apple-touch-icon-precomposed-114.png">
<!-- iPhone non-retina icon (iOS < 7) -->
<link rel="apple-touch-icon-precomposed" sizes="57x57" href="../dist/img/apple-touch-icon-precomposed-57.png">
<link rel="stylesheet" href="../dist/css/rcue.min.css" >
<link rel="stylesheet" href="../dist/css/rcue-additions.min.css" >
<link href="tests.css" rel="stylesheet" media="screen, print">
<script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<script src="../components/patternfly/dist/js/patternfly.min.js"></script>
</head>

<body>
<div class="container">
<div class="page-header">
<h1>About Modal</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>
<button class="btn btn-default" data-toggle="modal" data-target="#myModal">Launch about modal</button>
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content about-modal-pf">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
<span class="pficon pficon-close"></span>
</button>
</div>
<div class="modal-body">
<h1>Product Title</h1>
<div class="product-versions-pf">
<ul class="list-unstyled">
<li><strong>Label</strong> Version</li>
<li><strong>Label</strong> Version</li>
<li><strong>Label</strong> Version</li>
<li><strong>Label</strong> Version</li>
<li><strong>Label</strong> Version</li>
<li><strong>Label</strong> Version</li>
</ul>
</div>
<div class="trademark-pf">
Trademark and Copyright Information
</div>
</div>
<div class="modal-footer">
<img src="../dist/img/logo-alt.svg" alt="Patternfly Symbol">
</div>
</div>
</div>
</div>
</div><!-- /container -->
</body>
</html>
3 changes: 3 additions & 0 deletions tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ <h1>Red Hat&reg; Common User Experience</h1>
<div class="col-sm-6">
<h2>Widgets</h2>
<ul>
<li>
<a href="about-modal.html">About Modal</a>
</li>
<li>
<a href="accordions.html">Accordions</a>
</li>
Expand Down

0 comments on commit 4bd784c

Please sign in to comment.