Merge pull request #128 from skateman/convert-3.6.0

Converted from upstream version 3.6.0

assets/javascripts/patternfly.js

@@ -89,14 +89,19 @@
         "sZeroRecords":
           "<p>Suggestions</p>" +
           "<ul>" +
-            "<li>Check the syntax of the search term.</li>" +
+            "<li>Check the javascript regular expression syntax of the search term.</li>" +
             "<li>Check that the correct menu option is chosen (token ID vs. user ID).</li>" +
-            "<li>Use wildcards (* to match zero or more characters or ? to match a single character).</li>" +
+            "<li>Use wildcards (* to match 0 or more characters, + to match 1 or more characters, ? to match 0 or 1 character).</li>" +
             "<li>Clear the search field, then click Search to return to the 20 most recent records.</li>" +
           "</ul>",
         "sSearch": ""
       },
-      "sPaginationType": "bootstrap_input"
+      "sPaginationType": "bootstrap_input",
+      "oSearch": {
+        "sSearch": "",
+        "bRegex": true,
+        "bSmart": false
+      }
     });
 
     /* Default class modification */

assets/stylesheets/_patternfly.scss

@@ -69,6 +69,7 @@
 @import "patternfly/lib/c3";
 @import "patternfly/lib/bootstrap-datetimepicker";
 @import "patternfly/mixins";
+@import "patternfly/about-modal";
 @import "patternfly/blank-slate";
 @import "patternfly/bootstrap-combobox";
 @import "patternfly/bootstrap-datepicker";

assets/stylesheets/patternfly/_about-modal.scss

@@ -0,0 +1,44 @@
+//
+// About Modal
+// --------------------------------------------------
+
+.about-modal-pf {
+  background-color: $color-pf-black-900;
+  background-image: url(if($bootstrap-sass-asset-helper, twbs-image-path("#{$img-path}/#{$modal-about-pf-bg-img}"), "#{$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));
+}

assets/stylesheets/patternfly/_navbar-alt.scss

@@ -43,7 +43,7 @@
         .caret,
         .fa,
         .glyphicon,
-        .pf-icon {
+        .pficon {
           color: $navbar-pf-alt-active-color;
         }
       }
@@ -62,7 +62,7 @@
 
       .caret,
       .fa,
-      .pf-icon {
+      .pficon {
         color: $navbar-pf-alt-color;
         font-size: ($font-size-base + 4);
       }
@@ -82,7 +82,7 @@
 
         .caret,
         .fa,
-        .pf-icon {
+        .pficon {
           color: $navbar-pf-alt-active-color;
         }
       }

assets/stylesheets/patternfly/_navbar-vertical.scss

@@ -40,7 +40,7 @@
         .caret,
         .fa,
         .glyphicon,
-        .pf-icon {
+        .pficon {
           color: $navbar-pf-vertical-active-color;
         }
       }
@@ -59,7 +59,7 @@
 
       .caret,
       .fa,
-      .pf-icon {
+      .pficon {
         color: $navbar-pf-vertical-color;
         font-size: ($font-size-base + 4);
       }
@@ -79,7 +79,7 @@
 
         .caret,
         .fa,
-        .pf-icon {
+        .pficon {
           color: $navbar-pf-vertical-active-color;
         }
       }

assets/stylesheets/patternfly/_variables.scss

@@ -55,6 +55,7 @@ $list-view-hover-bg:                                                $color-pf-bl
 $list-group-top-border:                                             $color-pf-black-200 !default;
 $login-bg-color:                                                    $color-pf-black !default;
 $login-container-bg-color-rgba:                                     rgba($color-pf-white, 0.055) !default;
+$modal-about-pf-bg-img:                                             "bg-modal-about-pf.png" !default;
 $modal-title-padding-horizontal:                                    18px !default;
 $modal-title-padding-vertical:                                      10px !default;
 $navbar-pf-active-color:                                            $color-pf-black-150 !default;

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "patternfly-sass",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "license": "Apache-2.0",
   "homepage": "https://www.patternfly.org",
   "authors": [

lib/patternfly-sass/version.rb

@@ -1,4 +1,4 @@
 module Patternfly
-  VERSION = '3.5.1'
-  PATTERNFLY_SHA = 'ca47c9ba9899549b2ae5413a572b7c64d3a68c2e'
+  VERSION = '3.6.0'
+  PATTERNFLY_SHA = 'b9e28afcc76eac2f7c07ff4948e21bcd53b6f0b4'
 end

spec/html/about-modal.html

@@ -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 - 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="../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/patternfly.min.css" >
+    <link rel="stylesheet" href="../dist/css/patternfly-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="../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>

spec/html/index.html

@@ -45,6 +45,9 @@ <h1>PatternFly</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>