Merge pull request #143 from skateman/convert-3.15

Converted from upstream version 3.15.0

assets/javascripts/patternfly-functions.js

@@ -613,13 +613,7 @@
 
       forceResize = function (delay) {
         setTimeout(function () {
-          if (window.dispatchEvent) {
-            window.dispatchEvent(new Event('resize'));
-          }
-          // Special case for IE
-          if ($(document).fireEvent) {
-            $(document).fireEvent('onresize');
-          }
+          $(window).trigger('resize');
         }, delay);
       },
 

assets/javascripts/patternfly-settings.js

@@ -492,15 +492,6 @@
     'desktop': 1200
   };
 
-  if (typeof define === 'function' && define.amd) {
-    define("patternfly", function () {
-      return patternfly;
-    });
-  } else if ('undefined' !== typeof exports && 'undefined' !== typeof module) {
-    module.exports = patternfly;
-  } else {
-    window.patternfly = patternfly;
-  }
-
+  window.patternfly = patternfly;
 })(window);
 

assets/javascripts/patternfly.js

@@ -492,16 +492,7 @@
     'desktop': 1200
   };
 
-  if (typeof define === 'function' && define.amd) {
-    define("patternfly", function () {
-      return patternfly;
-    });
-  } else if ('undefined' !== typeof exports && 'undefined' !== typeof module) {
-    module.exports = patternfly;
-  } else {
-    window.patternfly = patternfly;
-  }
-
+  window.patternfly = patternfly;
 })(window);
 
 
@@ -1120,13 +1111,7 @@
 
       forceResize = function (delay) {
         setTimeout(function () {
-          if (window.dispatchEvent) {
-            window.dispatchEvent(new Event('resize'));
-          }
-          // Special case for IE
-          if ($(document).fireEvent) {
-            $(document).fireEvent('onresize');
-          }
+          $(window).trigger('resize');
         }, delay);
       },
 

assets/stylesheets/_patternfly.scss

@@ -61,7 +61,7 @@
 @import "patternfly/tabs";
 @import "patternfly/tooltip";
 @import "patternfly/type";
-@import "patternfly/lib/bootstrap-combobox";
+@import "patternfly/lib/patternfly-bootstrap-combobox";
 @import "patternfly/lib/bootstrap-datepicker";
 @import "patternfly/lib/bootstrap-select";
 @import "patternfly/lib/bootstrap-switch";

assets/stylesheets/patternfly/_vertical-nav.scss

@@ -354,10 +354,10 @@
         right: 21px;
       }
       .collapsed-secondary-nav-pf & {
-        z-index: $zindex-navbar-fixed;
+        z-index: 0;
       }
       .collapsed-tertiary-nav-pf & {
-        z-index: $zindex-navbar-fixed;
+        z-index: 0;
       }
     }
   }
@@ -417,7 +417,7 @@
     &.active,
     &.hover {
       > a {
-        z-index: $zindex-navbar-fixed;
+        z-index: 0;
       }
     }
   }

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "patternfly-sass",
-  "version": "3.14.0",
+  "version": "3.15.0",
   "license": "Apache-2.0",
   "homepage": "https://www.patternfly.org",
   "authors": [
@@ -29,7 +29,6 @@
   ],
   "dependencies": {
     "bootstrap-sass": "~3.3.7",
-    "bootstrap-combobox": "~1.1.7",
     "bootstrap-datepicker": "~1.6.4",
     "bootstrap-select": "~1.10.0",
     "bootstrap-switch": "~3.3.2",
@@ -45,6 +44,7 @@
     "matchHeight": "~0.7.0",
     "eonasdan-bootstrap-datetimepicker": "~4.17.37",
     "moment": "~2.14.1",
+    "patternfly-bootstrap-combobox": "~1.1.7",
     "patternfly-bootstrap-treeview": "~2.1.0"
   }
 }

lib/patternfly-sass/version.rb

@@ -1,4 +1,4 @@
 module Patternfly
-  VERSION = '3.14.0'
-  PATTERNFLY_SHA = '2d9bbebfb2f9f181746951a74b56d9850ac1822d'
+  VERSION = '3.15.0'
+  PATTERNFLY_SHA = '2eda227cf8a967c8a39bba84a631f9a5ff580bfc'
 end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "patternfly-sass",
-  "version": "3.14.0",
+  "version": "3.15.0",
   "author": "Red Hat",
   "license": "Apache-2.0",
   "dependencies": {

spec/html/dist/css/patternfly-additions.css

@@ -6036,11 +6036,11 @@ table.dataTable th:active {
 }
 .collapsed-secondary-nav-pf .secondary-nav-item-pf.active > a,
 .collapsed-secondary-nav-pf .secondary-nav-item-pf:hover > a {
-  z-index: 1030;
+  z-index: 0;
 }
 .collapsed-tertiary-nav-pf .secondary-nav-item-pf.active > a,
 .collapsed-tertiary-nav-pf .secondary-nav-item-pf:hover > a {
-  z-index: 1030;
+  z-index: 0;
 }
 .nav-pf-vertical-with-badges .secondary-nav-item-pf.active > a,
 .nav-pf-vertical-with-badges .secondary-nav-item-pf:hover > a {
@@ -6087,7 +6087,7 @@ table.dataTable th:active {
 .nav-pf-vertical.collapsed-tertiary-nav-pf .tertiary-nav-item-pf.active > a,
 .nav-pf-vertical.collapsed-tertiary-nav-pf .secondary-nav-item-pf.hover > a,
 .nav-pf-vertical.collapsed-tertiary-nav-pf .tertiary-nav-item-pf.hover > a {
-  z-index: 1030;
+  z-index: 0;
 }
 @media (min-width: 1200px) {
   .nav-pf-vertical.nav-pf-persistent-secondary.secondary-visible-pf {

tasks/converter.rb

@@ -135,8 +135,8 @@ def fix_top_level(file)
     file = replace_all(file, "@import \"patternfly/font-awesome/less/variables\";\n", '')
     file = replace_all(file, 'patternfly/font-awesome/less/font-awesome', 'font-awesome')
 
-    bower_contrib('bootstrap-combobox/css/bootstrap-combobox.css', 'bootstrap-combobox.scss', false)
-    file = replace_all(file, 'patternfly//patternfly-bootstrap-combobox/less/combobox', 'patternfly/lib/bootstrap-combobox')
+    bower_contrib('patternfly-bootstrap-combobox/css/bootstrap-combobox.css', 'patternfly-bootstrap-combobox.scss', false)
+    file = replace_all(file, 'patternfly//patternfly-bootstrap-combobox/less/combobox', 'patternfly/lib/patternfly-bootstrap-combobox')
 
     bower_contrib('bootstrap-select/dist/css/bootstrap-select.css', 'bootstrap-select.scss', false)
     file = replace_all(file, 'patternfly/bootstrap-select/less/bootstrap-select', 'patternfly/lib/bootstrap-select')