Skip to content

Commit df56b62

Browse files
Merge branch '_bump-v3.22.1-local' into master-dist
2 parents 75e1c97 + 2b80c93 commit df56b62

10 files changed

+90
-13
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-patternfly",
3-
"version": "3.21.0",
3+
"version": "3.22.1",
44
"authors": [
55
"Red Hat"
66
],
@@ -43,7 +43,7 @@
4343
"angular-sanitize": "1.3.0 - 1.5.*",
4444
"angular-bootstrap": "0.14.x",
4545
"lodash": "3.x",
46-
"patternfly": "~3.21.0"
46+
"patternfly": "~3.22.1"
4747
},
4848
"devDependencies": {
4949
"angular-mocks": "1.3.0 - 1.5.*",

dist/docs/css/patternfly-additions.css

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3090,6 +3090,9 @@ fieldset[disabled] .combobox-container .input-group-addon.active {
30903090
.pficon-resource-pool:before {
30913091
content: "\e90c";
30923092
}
3093+
.pficon-resources-almost-empty:before {
3094+
content: "\e91d";
3095+
}
30933096
.pficon-resources-almost-full:before {
30943097
content: "\e912";
30953098
}
@@ -5426,6 +5429,20 @@ table.dataTable th:active {
54265429
min-height: 40px;
54275430
line-height: 40px;
54285431
}
5432+
.table-view-pf-colvis-menu > li {
5433+
padding: 5px 10px;
5434+
}
5435+
.table-view-pf-colvis-menu > li:hover {
5436+
background-color: #def3ff;
5437+
}
5438+
.table-view-pf-colvis-menu > li > input {
5439+
margin-top: 0;
5440+
margin-right: 10px;
5441+
vertical-align: middle;
5442+
}
5443+
.table-view-pf-colvis-menu > li > label {
5444+
margin-bottom: 0;
5445+
}
54295446
.table-view-pf-actions {
54305447
background-color: #f1f1f1;
54315448
height: 100%;
@@ -5467,13 +5484,18 @@ table.dataTable th:active {
54675484
.bootstrap-datetimepicker-widget.dropdown-menu {
54685485
left: 0!important;
54695486
padding: 0;
5470-
top: 23px!important;
54715487
width: calc(100% - 25px);
54725488
}
54735489
.bootstrap-datetimepicker-widget.dropdown-menu:before,
54745490
.bootstrap-datetimepicker-widget.dropdown-menu:after {
54755491
content: none;
54765492
}
5493+
.bootstrap-datetimepicker-widget.dropdown-menu.top {
5494+
margin-bottom: -1px;
5495+
}
5496+
.bootstrap-datetimepicker-widget.dropdown-menu.bottom {
5497+
margin-top: -1px;
5498+
}
54775499
.bootstrap-datetimepicker-widget .timepicker-hour {
54785500
width: 100%;
54795501
}

dist/docs/css/patternfly.css

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9879,14 +9879,68 @@ fieldset[disabled] .pagination > li > span.active {
98799879
border-color: #bbb;
98809880
border-top-color: #bbb;
98819881
}
9882-
.panel-group .panel-heading {
9882+
.panel-group .panel-default .panel-heading {
98839883
background-image: linear-gradient(to bottom, #fafafa 0%, #ededed 100%);
98849884
background-repeat: repeat-x;
98859885
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffededed', GradientType=0);
98869886
}
9887-
.panel-group .panel-heading + .panel-collapse .panel-body {
9887+
.panel-group .panel-default .panel-heading + .panel-collapse .panel-body {
98889888
border-top: 1px solid #d1d1d1;
98899889
}
9890+
.panel-group .panel-primary {
9891+
border-color: #39a5dc;
9892+
}
9893+
.panel-group .panel-primary .panel-heading {
9894+
background-color: #def0f9;
9895+
}
9896+
.panel-group .panel-primary + .panel-default {
9897+
border-top-color: #39a5dc;
9898+
}
9899+
.panel-group .panel-success {
9900+
border-color: #3f9c35;
9901+
}
9902+
.panel-group .panel-success .panel-heading {
9903+
background-color: #e9f4e9;
9904+
}
9905+
.panel-group .panel-success + .panel-default {
9906+
border-top-color: #3f9c35;
9907+
}
9908+
.panel-group .panel-success + .panel-primary {
9909+
border-top-color: #3f9c35;
9910+
}
9911+
.panel-group .panel-warning {
9912+
border-color: #ec7a08;
9913+
}
9914+
.panel-group .panel-warning .panel-heading {
9915+
background-color: #fdf2e5;
9916+
}
9917+
.panel-group .panel-warning + .panel-default {
9918+
border-top-color: #ec7a08;
9919+
}
9920+
.panel-group .panel-warning + .panel-primary {
9921+
border-top-color: #ec7a08;
9922+
}
9923+
.panel-group .panel-warning + .panel-success {
9924+
border-top-color: #ec7a08;
9925+
}
9926+
.panel-group .panel-danger {
9927+
border-color: #cc0000;
9928+
}
9929+
.panel-group .panel-danger .panel-heading {
9930+
background-color: #ffe6e6;
9931+
}
9932+
.panel-group .panel-danger + .panel-default {
9933+
border-top-color: #cc0000;
9934+
}
9935+
.panel-group .panel-danger + .panel-primary {
9936+
border-top-color: #cc0000;
9937+
}
9938+
.panel-group .panel-danger + .panel-success {
9939+
border-top-color: #cc0000;
9940+
}
9941+
.panel-group .panel-danger + .panel-warning {
9942+
border-top-color: #cc0000;
9943+
}
98909944
.panel-group .panel-title {
98919945
font-weight: 500;
98929946
line-height: 1;
300 Bytes
Binary file not shown.

dist/docs/fonts/PatternFlyIcons-webfont.svg

Lines changed: 1 addition & 0 deletions
Loading
300 Bytes
Binary file not shown.
300 Bytes
Binary file not shown.

dist/docs/grunt-scripts/patternfly.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'use strict';
33

44
var patternfly = {
5-
version: "3.21.0",
5+
version: "3.22.1",
66
};
77

88
// Util: PatternFly Palette colors

npm-shrinkwrap.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"author": "Red Hat",
33
"name": "angular-patternfly",
4-
"version": "3.21.0",
4+
"version": "3.22.1",
55
"license": "Apache-2.0",
66
"description": "Angular extension of the PatternFly project.",
77
"keywords": ["angular", "patternfly"],
@@ -14,7 +14,7 @@
1414
"angular-sanitize": "1.3.0 - 1.5.*",
1515
"angular-ui-bootstrap": "0.14.x",
1616
"lodash": "3.x",
17-
"patternfly": "~3.21.0"
17+
"patternfly": "~3.22.1"
1818
},
1919
"devDependencies": {
2020
"express": "3.4.4",
@@ -44,7 +44,7 @@
4444
"karma-phantomjs-launcher": "^1.0.0",
4545
"matchdep": "0.3.0",
4646
"nsp": "^2.6.1",
47-
"patternfly-eng-release": "~3.21.0"
47+
"patternfly-eng-release": "~3.22.1"
4848
},
4949
"scripts": {
5050
"test": "grunt test"

0 commit comments

Comments
 (0)