Skip to content

Commit 6e539df

Browse files
Merge branch '_bump-v3.20.0-local' into master-dist
2 parents fac4c9b + c8f40f3 commit 6e539df

File tree

60 files changed

+190508
-18396
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+190508
-18396
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.19.0",
3+
"version": "3.20.0",
44
"authors": [
55
"Red Hat"
66
],
@@ -42,7 +42,7 @@
4242
"angular-sanitize": "1.3.0 - 1.5.*",
4343
"angular-bootstrap": "0.14.x",
4444
"lodash": "3.x",
45-
"patternfly": "~3.19.0"
45+
"patternfly": "~3.20.0"
4646
},
4747
"devDependencies": {
4848
"angular-mocks": "1.3.0 - 1.5.*",

dist/docs/css/patternfly-additions.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2996,6 +2996,9 @@ fieldset[disabled] .combobox-container .input-group-addon.active {
29962996
.pficon-cpu:before {
29972997
content: "\e905";
29982998
}
2999+
.pficon-degraded:before {
3000+
content: "\e91b";
3001+
}
29993002
.pficon-delete:before {
30003003
content: "\e611";
30013004
}
@@ -3065,6 +3068,9 @@ fieldset[disabled] .combobox-container .input-group-addon.active {
30653068
.pficon-project:before {
30663069
content: "\e622";
30673070
}
3071+
.pficon-rebalance:before {
3072+
content: "\e91c";
3073+
}
30683074
.pficon-refresh:before,
30693075
.pficon-restart:before {
30703076
content: "\e613";

dist/docs/css/patternfly.css

Lines changed: 63 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,90 @@
44
font-style: normal;
55
font-weight: 300;
66
src: url("../fonts/OpenSans-Light-webfont.eot");
7-
src: url("../fonts/OpenSans-Light-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Light-webfont.woff") format("woff"), url("../fonts/OpenSans-Light-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Light-webfont.svg#OpenSansLight") format("svg");
7+
/* IE9 Compat Modes */
8+
src: local("Open Sans Light"), local("OpenSans-Light"), url("../fonts/OpenSans-Light-webfont.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ url("../fonts/OpenSans-Light-webfont.woff2") format("woff2"), /* Super Modern Browsers */ url("../fonts/OpenSans-Light-webfont.woff") format("woff"), /* Modern Browsers */ url("../fonts/OpenSans-Light-webfont.ttf") format("truetype"), /* Safari, Android, iOS */ url("../fonts/OpenSans-Light-webfont.svg#OpenSans") format("svg");
9+
/* Legacy iOS */
810
}
911
@font-face {
1012
font-family: "Open Sans";
1113
font-style: normal;
1214
font-weight: 400;
1315
src: url("../fonts/OpenSans-Regular-webfont.eot");
14-
src: url("../fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Regular-webfont.woff") format("woff"), url("../fonts/OpenSans-Regular-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular") format("svg");
16+
/* IE9 Compat Modes */
17+
src: local("Open Sans"), local("OpenSans"), url("../fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ url("../fonts/OpenSans-Regular-webfont.woff2") format("woff2"), /* Super Modern Browsers */ url("../fonts/OpenSans-Regular-webfont.woff") format("woff"), /* Modern Browsers */ url("../fonts/OpenSans-Regular-webfont.ttf") format("truetype"), /* Safari, Android, iOS */ url("../fonts/OpenSans-Regular-webfont.svg#OpenSans") format("svg");
18+
/* Legacy iOS */
19+
}
20+
@font-face {
21+
font-family: "Open Sans";
22+
font-style: italic;
23+
font-weight: 300;
24+
src: url("../fonts/OpenSans-LightItalic-webfont.eot");
25+
/* IE9 Compat Modes */
26+
src: local("Open Sans Light Italic"), local("OpenSansLight-Italic"), url("../fonts/OpenSans-LightItalic-webfont.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ url("../fonts/OpenSans-LightItalic-webfont.woff2") format("woff2"), /* Super Modern Browsers */ url("../fonts/OpenSans-LightItalic-webfont.woff") format("woff"), /* Modern Browsers */ url("../fonts/OpenSans-LightItalic-webfont.ttf") format("truetype"), /* Safari, Android, iOS */ url("../fonts/OpenSans-LightItalic-webfont.svg#OpenSans") format("svg");
27+
/* Legacy iOS */
28+
}
29+
@font-face {
30+
font-family: "Open Sans";
31+
font-style: italic;
32+
font-weight: 400;
33+
src: url("../fonts/OpenSans-Italic-webfont.eot");
34+
/* IE9 Compat Modes */
35+
src: local("Open Sans Italic"), local("OpenSans-Italic"), url("../fonts/OpenSans-Italic-webfont.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ url("../fonts/OpenSans-Italic-webfont.woff2") format("woff2"), /* Super Modern Browsers */ url("../fonts/OpenSans-Italic-webfont.woff") format("woff"), /* Modern Browsers */ url("../fonts/OpenSans-Italic-webfont.ttf") format("truetype"), /* Safari, Android, iOS */ url("../fonts/OpenSans-Italic-webfont.svg#OpenSans") format("svg");
36+
/* Legacy iOS */
1537
}
1638
@font-face {
1739
font-family: "Open Sans";
1840
font-style: normal;
1941
font-weight: 600;
2042
src: url("../fonts/OpenSans-Semibold-webfont.eot");
21-
src: url("../fonts/OpenSans-Semibold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Semibold-webfont.woff") format("woff"), url("../fonts/OpenSans-Semibold-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Semibold-webfont.svg#OpenSansSemibold") format("svg");
43+
/* IE9 Compat Modes */
44+
src: local("Open Sans Semibold"), local("OpenSans-Semibold-webfont"), url("../fonts/OpenSans-Semibold-webfont.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ url("../fonts/OpenSans-Semibold-webfont.woff2") format("woff2"), /* Super Modern Browsers */ url("../fonts/OpenSans-Semibold-webfont.woff") format("woff"), /* Modern Browsers */ url("../fonts/OpenSans-Semibold-webfont.ttf") format("truetype"), /* Safari, Android, iOS */ url("../fonts/OpenSans-Semibold-webfont.svg#OpenSans") format("svg");
45+
/* Legacy iOS */
46+
}
47+
@font-face {
48+
font-family: "Open Sans";
49+
font-style: italic;
50+
font-weight: 600;
51+
src: url("../fonts/OpenSans-SemiboldItalic-webfont.eot");
52+
/* IE9 Compat Modes */
53+
src: local("Open Sans Semibold Italic"), local("OpenSans-SemiboldItalic-webfont"), url("../fonts/OpenSans-SemiboldItalic-webfont.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ url("../fonts/OpenSans-SemiboldItalic-webfont.woff2") format("woff2"), /* Super Modern Browsers */ url("../fonts/OpenSans-SemiboldItalic-webfont.woff") format("woff"), /* Modern Browsers */ url("../fonts/OpenSans-SemiboldItalic-webfont.ttf") format("truetype"), /* Safari, Android, iOS */ url("../fonts/OpenSans-SemiboldItalic-webfont.svg#OpenSans") format("svg");
54+
/* Legacy iOS */
2255
}
2356
@font-face {
2457
font-family: "Open Sans";
2558
font-style: normal;
2659
font-weight: 700;
2760
src: url("../fonts/OpenSans-Bold-webfont.eot");
28-
src: url("../fonts/OpenSans-Bold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Bold-webfont.woff") format("woff"), url("../fonts/OpenSans-Bold-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Bold-webfont.svg#OpenSansBold") format("svg");
61+
/* IE9 Compat Modes */
62+
src: local("Open Sans Bold"), local("OpenSans-Bold"), url("../fonts/OpenSans-Bold-webfont.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ url("../fonts/OpenSans-Bold-webfont.woff2") format("woff2"), /* Super Modern Browsers */ url("../fonts/OpenSans-Bold-webfont.woff") format("woff"), /* Modern Browsers */ url("../fonts/OpenSans-Bold-webfont.ttf") format("truetype"), /* Safari, Android, iOS */ url("../fonts/OpenSans-Bold-webfont.svg#OpenSans") format("svg");
63+
/* Legacy iOS */
64+
}
65+
@font-face {
66+
font-family: "Open Sans";
67+
font-style: italic;
68+
font-weight: 700;
69+
src: url("../fonts/OpenSans-BoldItalic-webfont.eot");
70+
/* IE9 Compat Modes */
71+
src: local("Open Sans Bold Italic"), local("OpenSans-BoldItalic"), url("../fonts/OpenSans-BoldItalic-webfont.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ url("../fonts/OpenSans-BoldItalic-webfont.woff2") format("woff2"), /* Super Modern Browsers */ url("../fonts/OpenSans-BoldItalic-webfont.woff") format("woff"), /* Modern Browsers */ url("../fonts/OpenSans-BoldItalic-webfont.ttf") format("truetype"), /* Safari, Android, iOS */ url("../fonts/OpenSans-BoldItalic-webfont.svg#OpenSans") format("svg");
72+
/* Legacy iOS */
73+
}
74+
@font-face {
75+
font-family: "Open Sans";
76+
font-style: italic;
77+
font-weight: 800;
78+
src: url("../fonts/OpenSans-ExtraBoldItalic-webfont.eot");
79+
/* IE9 Compat Modes */
80+
src: local("Open Sans Extrabold Italic"), local("OpenSans-ExtraboldItalic"), url("../fonts/OpenSans-ExtraBoldItalic-webfont.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ url("../fonts/OpenSans-ExtraBoldItalic-webfont.woff2") format("woff2"), /* Super Modern Browsers */ url("../fonts/OpenSans-ExtraBoldItalic-webfont.woff") format("woff"), /* Modern Browsers */ url("../fonts/OpenSans-ExtraBoldItalic-webfont.ttf") format("truetype"), /* Safari, Android, iOS */ url("../fonts/OpenSans-ExtraBoldItalic-webfont.svg#OpenSans") format("svg");
81+
/* Legacy iOS */
2982
}
3083
@font-face {
3184
font-family: "Open Sans";
3285
font-style: normal;
3386
font-weight: 800;
3487
src: url("../fonts/OpenSans-ExtraBold-webfont.eot");
35-
src: url("../fonts/OpenSans-ExtraBold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-ExtraBold-webfont.woff") format("woff"), url("../fonts/OpenSans-ExtraBold-webfont.ttf") format("truetype"), url("../fonts/OpenSans-ExtraBold-webfont.svg#OpenSansExtrabold") format("svg");
88+
/* IE9 Compat Modes */
89+
src: local("Open Sans Extrabold"), local("OpenSans-Extrabold"), url("../fonts/OpenSans-ExtraBold-webfont.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ url("../fonts/OpenSans-ExtraBold-webfont.woff2") format("woff2"), /* Super Modern Browsers */ url("../fonts/OpenSans-ExtraBold-webfont.woff") format("woff"), /* Modern Browsers */ url("../fonts/OpenSans-ExtraBold-webfont.ttf") format("truetype"), /* Safari, Android, iOS */ url("../fonts/OpenSans-ExtraBold-webfont.svg#OpenSans") format("svg");
90+
/* Legacy iOS */
3691
}
3792
/*!
3893
* Bootstrap v3.3.7 (http://getbootstrap.com)
@@ -9749,14 +9804,16 @@ fieldset[disabled] .pagination > li > span.active {
97499804
.content-view-pf-pagination {
97509805
background-color: #f5f5f5;
97519806
border: 1px solid #d1d1d1;
9752-
border-top: none;
97539807
display: -ms-flexbox;
97549808
display: flex;
97559809
-ms-flex-wrap: wrap;
97569810
flex-wrap: wrap;
97579811
-ms-flex-pack: justify;
97589812
justify-content: space-between;
97599813
}
9814+
.content-view-pf-pagination.table-view-pf-pagination {
9815+
border-top: none;
9816+
}
97609817
.content-view-pf-pagination .form-group {
97619818
-ms-flex-align: baseline;
97629819
align-items: baseline;
78.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)