Merge branch '_bump-v3.18.0-local' into master-dist

patternfly · Jan 18, 2017 · da7f930 · da7f930
2 parents 9216c29 + 6941a81
commit da7f930
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-patternfly",
-  "version": "3.17.0",
+  "version": "3.18.0",
   "authors": [
     "Red Hat"
   ],
@@ -42,7 +42,7 @@
     "angular-sanitize": "1.3.0 - 1.5.*",
     "angular-bootstrap": "0.14.x",
     "lodash": "3.x",
-    "patternfly": "~3.17.0"
+    "patternfly": "git://github.com/patternfly/patternfly.git#master-dist"
   },
   "devDependencies": {
     "angular-mocks": "1.3.0 - 1.5.*",

diff --git a/dist/docs/css/patternfly-additions.css b/dist/docs/css/patternfly-additions.css
@@ -2750,6 +2750,8 @@ fieldset[disabled] .combobox-container .input-group-addon.active {
 }
 .close {
   text-shadow: none;
+  z-index: 1;
+  position: relative;
   opacity: 0.6;
   filter: alpha(opacity=60);
 }
@@ -3602,6 +3604,8 @@ a.disabled {
 }
 .list-view-pf-stacked .list-view-pf-description {
   display: block;
+  -ms-flex: none;
+      flex: none;
 }
 @media (min-width: 992px) {
   .list-view-pf-description {

diff --git a/dist/docs/css/patternfly.css b/dist/docs/css/patternfly.css
@@ -9746,6 +9746,68 @@ fieldset[disabled] .pagination > li > span.active {
   font-size: 12px;
   margin-top: 2px;
 }
+.content-view-pf-pagination {
+  background-color: #f5f5f5;
+  border: 1px solid #d1d1d1;
+  border-top: none;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
+  -ms-flex-pack: justify;
+      justify-content: space-between;
+}
+.content-view-pf-pagination .form-group {
+  -ms-flex-align: baseline;
+      align-items: baseline;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-positive: 1;
+      flex-grow: 1;
+  float: left;
+  margin: 5px;
+}
+@supports (display: flex) {
+  .content-view-pf-pagination .form-group {
+    float: none;
+  }
+}
+.content-view-pf-pagination .form-group:last-child {
+  -ms-flex-pack: end;
+      justify-content: flex-end;
+  float: right;
+}
+@supports (display: flex) {
+  .content-view-pf-pagination .form-group:last-child {
+    float: none;
+  }
+}
+.content-view-pf-pagination .form-group .pagination-pf-pagesize.bootstrap-select.btn-group {
+  display: -ms-flexbox;
+  display: flex;
+  margin-right: 5px;
+  width: auto;
+}
+.content-view-pf-pagination .pagination-pf-page {
+  margin-left: 10px;
+  margin-right: 5px;
+  padding: 0 2px 2px;
+  text-align: right;
+  width: 2.5em;
+}
+.content-view-pf-pagination .pagination {
+  display: -ms-flexbox;
+  display: flex;
+  margin: 0 0 0 10px;
+}
+.content-view-pf-pagination .pagination a {
+  float: none;
+}
+@supports (display: flex) {
+  .content-view-pf-pagination .pagination a {
+    display: block;
+  }
+}
 .panel-title {
   font-weight: 700;
 }

diff --git a/dist/docs/grunt-scripts/patternfly.js b/dist/docs/grunt-scripts/patternfly.js
@@ -2,7 +2,7 @@
   'use strict';
 
   var patternfly = {
-    version: "3.13.0"
+    version: "3.18.0",
   };
 
   // Util: PatternFly Palette colors
@@ -200,6 +200,26 @@
           legend: this.getDefaultGroupedBarLegend()
         };
       },
+      getDefaultStackedBarGrid = function () {
+        return {
+          y: {
+            show: true
+          }
+        };
+      },
+      getDefaultStackedBarLegend = function () {
+        return {
+          show: true,
+          position: 'bottom'
+        };
+      },
+      getDefaultStackedBarConfig = function () {
+        return {
+          color: this.getDefaultColors(),
+          grid: this.getDefaultStackedBarGrid(),
+          legend: this.getDefaultStackedBarLegend()
+        };
+      },
       getDefaultDonut = function (title) {
         return {
           title: title,
@@ -450,6 +470,9 @@
       getDefaultGroupedBarGrid: getDefaultGroupedBarGrid,
       getDefaultGroupedBarLegend: getDefaultGroupedBarLegend,
       getDefaultGroupedBarConfig: getDefaultGroupedBarConfig,
+      getDefaultStackedBarGrid: getDefaultStackedBarGrid,
+      getDefaultStackedBarLegend: getDefaultStackedBarLegend,
+      getDefaultStackedBarConfig: getDefaultStackedBarConfig,
       getDefaultDonut: getDefaultDonut,
       getDefaultDonutSize: getDefaultDonutSize,
       getDefaultDonutColors: getDefaultDonutColors,

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "author": "Red Hat",
   "name": "angular-patternfly",
-  "version": "3.17.0",
+  "version": "3.18.0",
   "license": "Apache-2.0",
   "description": "Angular extension of the PatternFly project.",
   "keywords": ["angular", "patternfly"],
@@ -13,7 +13,7 @@
     "angular-sanitize": "1.3.0 - 1.5.*",
     "angular-ui-bootstrap": "0.14.x",
     "lodash": "3.x",
-    "patternfly": "~3.17.0"
+    "patternfly": "git+https://github.com/patternfly/patternfly.git#master-dist"
   },
   "devDependencies": {
     "express": "3.4.4",
@@ -43,7 +43,7 @@
     "karma-phantomjs-launcher": "^1.0.0",
     "matchdep": "0.3.0",
     "nsp": "^2.6.1",
-    "patternfly-eng-release": "~3.17.0"
+    "patternfly-eng-release": "git+https://github.com/patternfly/patternfly-eng-release.git"
   },
   "scripts": {
     "test": "grunt test"