Merge pull request #1399 from AllenBW/bug/fix-ui-components-select

ui-comp dialog select/multi-select assumes correct styling
ManageIQ · Mar 15, 2018 · ed0b7d5 · ed0b7d5
2 parents ed710be + 12a434b
commit ed0b7d5
Show file tree

Hide file tree

Showing 3 changed files with 1,184 additions and 1,065 deletions.
diff --git a/client/app.js b/client/app.js
@@ -34,6 +34,8 @@ require('@uirouter/angularjs/release/stateEvents')
 require('ngstorage')
 
 // Libraries: ui-components
+require('bootstrap')
+require('bootstrap-select')
 require('bootstrap-datepicker')
 require('angular-bootstrap-switch')
 require('angular-ui-sortable')

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "@angular/platform-browser-dynamic": "5.2.7",
     "@angular/upgrade": "5.2.7",
     "@manageiq/font-fabulous": "1.0.0",
-    "@manageiq/ui-components": "1.1.6",
+    "@manageiq/ui-components": "1.1.8",
     "@uirouter/angularjs": "1.0.15",
     "actioncable": "5.1.5",
     "angular": "1.6.9",
@@ -63,7 +63,6 @@
     "babel-loader": "7.1.4",
     "babel-preset-env": "1.6.1",
     "body-parser": "1.18.2",
-    "bootstrap": "3.1.1",
     "bootstrap-combobox": "1.0.2",
     "bootstrap-datepicker": "1.7.1",
     "bootstrap-switch": "3.3.4",