Merge pull request #1284 from rhamilto/patternfly-v3.21.0

Merged by openshift-bot

Author: OpenShift Bot

Gruntfile.js

@@ -234,7 +234,6 @@ module.exports = function (grunt) {
           'bower_components/messenger/build/js/messenger-theme-future.js',
           'bower_components/moment-timezone/builds/moment-timezone-with-data-2010-2020.js',
           'bower_components/fontawesome/css/font-awesome.css',
-          'bower_components/bootstrap-combobox/css/bootstrap-combobox.css',
           'bower_components/bootstrap-datepicker/dist/css/bootstrap-datepicker.css',
           'bower_components/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css',
           'bower_components/bootstrap-select/dist/css/bootstrap-select.css',
@@ -251,7 +250,8 @@ module.exports = function (grunt) {
           'bower_components/google-code-prettify/bin/prettify.min.js',
           'bower_components/google-code-prettify/bin/prettify.min.css',
           'bower_components/patternfly/dist/css/patternfly.css',
-          'bower_components/patternfly/dist/css/patternfly-additions.css'
+          'bower_components/patternfly/dist/css/patternfly-additions.css',
+          'bower_components/patternfly-bootstrap-combobox/css/bootstrap-combobox.css'
         ]
       }
     },

app/index.html

@@ -15,7 +15,6 @@
     <meta name="msapplication-TileImage" content="images/mstile-144x144.png">
     <!-- build:css(.) styles/vendor.css -->
     <!-- bower:css -->
-    <link rel="stylesheet" href="bower_components/patternfly-bootstrap-combobox/css/bootstrap-combobox.css" />
     <link rel="stylesheet" href="bower_components/angular-patternfly/dist/styles/angular-patternfly.css" />
     <link rel="stylesheet" href="bower_components/messenger/build/css/messenger-theme-flat.css" />
     <link rel="stylesheet" href="bower_components/kubernetes-label-selector/labelFilter.css" />
@@ -96,6 +95,7 @@ <h1>JavaScript Required</h1>
     <script src="bower_components/angular-touch/angular-touch.js"></script>
     <script src="bower_components/angular-route/angular-route.js"></script>
     <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
+    <script src="bower_components/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js"></script>
     <script src="bower_components/lodash/lodash.js"></script>
     <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
     <script src="bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script>

bower.json

@@ -13,11 +13,11 @@
     "angular-touch": "1.5.11",
     "angular-route": "1.5.11",
     "angular-bootstrap": "0.14.3",
-    "angular-patternfly": "3.18.1",
+    "angular-patternfly": "3.21.0",
     "uri.js": "1.18.0",
     "moment": "2.14.2",
     "moment-timezone": "0.5.3",
-    "patternfly": "3.18.1",
+    "patternfly": "3.21.0",
     "hawtio-core": "2.0.37",
     "hawtio-extension-service": "2.0.2",
     "jquery": "2.1.4",
@@ -55,8 +55,8 @@
   "resolutions": {
     "angular-bootstrap": "0.14.3",
     "d3": "3.5.17",
-    "patternfly": "3.18.1",
-    "angular-patternfly": "3.18.1",
+    "patternfly": "3.21.0",
+    "angular-patternfly": "3.21.0",
     "patternfly-bootstrap-treeview": "2.1.1",
     "angular": "1.5.11",
     "kubernetes-object-describer": "1.0.4",