Merge pull request #242 from patternfly/bump-v3.3.2

Bumped version number to 3.3.2
patternfly · Mar 30, 2016 · 73ac2c1 · 73ac2c1
2 parents db14876 + 1c2179b
commit 73ac2c1
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 33 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "patternfly",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "authors": "Red Hat",
   "license": "Apache-2.0",
   "homepage": "https://www.patternfly.org",
@@ -24,7 +24,7 @@
     "bootstrap": "~3.3.6",
     "bootstrap-combobox": "~1.1.6",
     "bootstrap-datepicker": "~1.4.0",
-    "bootstrap-select": "~1.7.3",
+    "bootstrap-select": "1.7.3",
     "bootstrap-switch": "~3.3.2",
     "bootstrap-touchspin": "~3.0.3",
     "bootstrap-treeview": "~1.2.0",

diff --git a/dist/css/patternfly-additions.css b/dist/css/patternfly-additions.css
diff --git a/dist/css/patternfly-additions.css.map b/dist/css/patternfly-additions.css.map
diff --git a/dist/css/patternfly-additions.min.css b/dist/css/patternfly-additions.min.css
diff --git a/dist/css/patternfly-additions.min.css.map b/dist/css/patternfly-additions.min.css.map
diff --git a/less/lib/bootstrap-select/bootstrap-select.less b/less/lib/bootstrap-select/bootstrap-select.less
@@ -94,14 +94,6 @@
     }
   }
 
-  &.bs-container {
-    position: absolute;
-
-    .dropdown-menu {
-      z-index: @zindex-select-dropdown;
-    }
-  }
-
   // The selectpicker button
   .dropdown-toggle {
     .filter-option {
@@ -127,6 +119,7 @@
   // The selectpicker dropdown
   .dropdown-menu {
     min-width: 100%;
+    z-index: @zindex-select-dropdown;
     box-sizing: border-box;
 
     &.inner {
@@ -152,10 +145,6 @@
 
       a {
         cursor: pointer;
-        -webkit-user-select: none;
-           -moz-user-select: none;
-            -ms-user-select: none;
-                user-select: none;
 
         &.opt {
           position: relative;
@@ -297,6 +286,7 @@
 }
 
 .bs-actionsbox {
+  float: left;
   width: 100%;
   box-sizing: border-box;
 
@@ -323,7 +313,6 @@
   & .form-control {
     margin-bottom: 0;
     width: 100%;
-    float: none;
   }
 }
 

diff --git a/less/lib/bootstrap-select/variables.less b/less/lib/bootstrap-select/variables.less
@@ -3,4 +3,4 @@
 
 @width-default: 220px; // 3 960px-grid columns
 
-@zindex-select-dropdown: 1060; // must be higher than a modal background (1050)
+@zindex-select-dropdown: 1035; // must be lower than a modal background (1040) but higher than the fixed navbar (1030)
diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "patternfly",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "author": "Red Hat",
   "license": "Apache-2.0",
   "dependencies": {
     "bootstrap": "~3.3.5",
     "bootstrap-datepicker": "~1.4.0",
-    "bootstrap-select": "~1.7.3",
+    "bootstrap-select": "1.7.3",
     "bootstrap-switch": "~3.3.2",
     "bootstrap-touchspin": "~3.1.1",
     "bootstrap-treeview": "~1.2.0",