Merge pull request #878 from ammendonca/HAWKULAR-1006

HAWKULAR-1006 : Update to Patternfly 3.3.1
hawkular · Mar 22, 2016 · da41b92 · da41b92
2 parents a7369a9 + 05cef39
commit da41b92
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 21 deletions.
diff --git a/console/src/main/scripts/bower.json b/console/src/main/scripts/bower.json
@@ -32,9 +32,9 @@
     "hawtio-extension-service": "2.0.3",
     "hawtio-oauth": "2.0.38",
     "lodash": "3.2.0",
-    "moment": "2.11.1",
-    "patternfly": "2.8.0",
-    "angular-patternfly": "2.8.1",
+    "moment": "2.12.0",
+    "patternfly": "3.3.1",
+    "angular-patternfly": "3.3.1",
     "keycloak": "1.8.1",
     "angular-wizard": "0.6.1",
     "angular-clipboard": "1.3.0",
@@ -47,9 +47,10 @@
     "hawtio-core-dts": "2.0.28"
   },
   "resolutions": {
-    "lodash": "3.2.0",
     "angular": "1.5.0",
+    "d3": "3.5.5",
     "keycloak": "1.8.1",
-    "d3": "3.5.5"
+    "lodash": "3.2.0",
+    "moment": "2.12.0"
   }
 }
diff --git a/console/src/main/scripts/plugins/accounts/less/accounts.less b/console/src/main/scripts/plugins/accounts/less/accounts.less
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-@import "../../../libs/patternfly/components/bootstrap/less/variables.less";
-@import "../../../libs/patternfly/components/bootstrap/less/mixins.less";
+@import "../../../libs/patternfly/less/lib/bootstrap/variables.less";
+@import "../../../libs/patternfly/less/lib/bootstrap/mixins.less";
 @import "../../../libs/patternfly/less/variables.less";
 
 

diff --git a/console/src/main/scripts/plugins/directives/subtab/less/subtab.less b/console/src/main/scripts/plugins/directives/subtab/less/subtab.less
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../../../libs/patternfly/components/bootstrap/less/variables.less";
-@import "../../../../libs/patternfly/components/bootstrap/less/mixins.less";
+@import "../../../../libs/patternfly/less/lib/bootstrap/variables.less";
+@import "../../../../libs/patternfly/less/lib/bootstrap/mixins.less";
 @import "../../../../libs/patternfly/less/variables.less";
 
 .navbar-pf {

diff --git a/console/src/main/scripts/plugins/directives/topbar/less/topbar.less b/console/src/main/scripts/plugins/directives/topbar/less/topbar.less
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../../../libs/patternfly/components/bootstrap/less/variables.less";
-@import "../../../../libs/patternfly/components/bootstrap/less/mixins.less";
+@import "../../../../libs/patternfly/less/lib/bootstrap/variables.less";
+@import "../../../../libs/patternfly/less/lib/bootstrap/mixins.less";
 @import "../../../../libs/patternfly/less/variables.less";
 
 .hk-screen-top-nav {

diff --git a/console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html b/console/src/main/scripts/plugins/metrics/html/app-details/detail-deployments.html
@@ -75,7 +75,7 @@ <h3>Deployments</h3>
           </div>
         </div>
 
-        <div id="DataTables_Table_0_wrapper" class="dataTables_wrapper no-footer">
+        <div id="DataTables_Table_0_wrapper" class="no-footer">
           <div class="dataTables_header">
             <div id="DataTables_Table_0_filter" class="dataTables_filter">
               <label><input type="search" ng-model="vm.search.name" aria-controls="DataTables_Table_0"></label>

diff --git a/console/src/main/scripts/plugins/metrics/html/directives/table-filters.html b/console/src/main/scripts/plugins/metrics/html/directives/table-filters.html
@@ -1,3 +1,3 @@
 <div>
-  <div pf-simple-filter id="exampleSimpleFilter" config="vm.filterConfig"></div>
+  <div pf-filter id="exampleSimpleFilter" config="vm.filterConfig"></div>
 </div>
diff --git a/console/src/main/scripts/plugins/metrics/less/metrics.less b/console/src/main/scripts/plugins/metrics/less/metrics.less
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../../libs/patternfly/components/bootstrap/less/variables.less";
-@import "../../../libs/patternfly/components/bootstrap/less/mixins.less";
+@import "../../../libs/patternfly/less/lib/bootstrap/variables.less";
+@import "../../../libs/patternfly/less/lib/bootstrap/mixins.less";
 @import "../../../libs/patternfly/less/variables.less";
 
 // Variables

diff --git a/console/src/main/scripts/plugins/topology/less/priority01Topology.less b/console/src/main/scripts/plugins/topology/less/priority01Topology.less
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../../libs/patternfly/components/bootstrap/less/variables.less";
-@import "../../../libs/patternfly/components/bootstrap/less/mixins.less";
+@import "../../../libs/patternfly/less/lib/bootstrap/variables.less";
+@import "../../../libs/patternfly/less/lib/bootstrap/mixins.less";
 @import "../../../libs/patternfly/less/variables.less";
 
 @edge-color: #bbb;

diff --git a/console/src/main/webapp/index.html b/console/src/main/webapp/index.html
@@ -20,10 +20,6 @@
     <script src="libs/es5-dom-shim/__COMIPLE/a.ie8.js"></script>
     <![endif]-->
     <script src="libs/es5-dom-shim/__COMPILE/a.js"></script>
-    <script src="libs/patternfly/components/jquery/dist/jquery.js"></script>
-    <script src="libs/patternfly/components/bootstrap/dist/js/bootstrap.js"></script>
-    <script src="libs/patternfly/components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script>
-
     <!-- bower:js -->
     <!-- endbower -->
   </head>