Skip to content

Commit 93d7a51

Browse files
Merge branch '_bump-v3.23.1-local' into master-dist
2 parents c2a842f + 71802ca commit 93d7a51

10 files changed

+183
-25
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.23.0",
3+
"version": "3.23.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.23.0"
46+
"patternfly": "~3.23.1"
4747
},
4848
"devDependencies": {
4949
"angular-mocks": "1.3.0 - 1.5.*",

dist/docs/css/patternfly-additions.css

Lines changed: 164 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1876,6 +1876,12 @@ select.selectpicker {
18761876
clip: rect(0, 0, 0, 0);
18771877
border: 0;
18781878
}
1879+
.text-overflow-pf {
1880+
overflow: hidden;
1881+
text-overflow: ellipsis;
1882+
white-space: nowrap;
1883+
word-wrap: normal;
1884+
}
18791885
.about-modal-pf {
18801886
background-color: #292e34;
18811887
background-image: url("../img/bg-modal-about-pf.png");
@@ -3015,7 +3021,7 @@ fieldset[disabled] .combobox-container .input-group-addon.active {
30153021
content: "\e906";
30163022
}
30173023
.pficon-equalizer:before {
3018-
content: "\e906";
3024+
content: "\e610";
30193025
}
30203026
.pficon-error-circle-o:before {
30213027
color: #cc0000;
@@ -3053,7 +3059,7 @@ fieldset[disabled] .combobox-container .input-group-addon.active {
30533059
content: "\e615";
30543060
}
30553061
.pficon-info:before {
3056-
content: "\e925";
3062+
content: "\e92b";
30573063
}
30583064
.pficon-key:before {
30593065
content: "\e924";
@@ -3471,25 +3477,172 @@ a.disabled {
34713477
background-color: #fff;
34723478
}
34733479
.list-pf-container {
3474-
-ms-flex-align: center;
3475-
align-items: center;
3480+
-ms-flex-align: start;
3481+
align-items: flex-start;
34763482
display: -ms-flexbox;
34773483
display: flex;
34783484
padding: 20px;
34793485
}
34803486
.list-pf-expansion .list-pf-container {
34813487
border-top: 1px solid #bbb;
34823488
}
3483-
.list-pf-chevron {
3484-
margin-right: 5px;
3489+
@media (min-width: 992px) {
3490+
.list-pf:not(.list-pf-stacked) .list-pf-container {
3491+
-ms-flex-align: center;
3492+
align-items: center;
3493+
}
34853494
}
3486-
.list-pf-chevron + .list-pf-content {
3487-
border-left: 1px solid #bbb;
3488-
padding-left: 15px;
3495+
.list-pf-chevron,
3496+
.list-pf-select {
3497+
margin-right: 10px;
34893498
}
3490-
.list-pf-chevron .fa {
3499+
.list-pf-chevron + .list-pf-content,
3500+
.list-pf-select + .list-pf-content {
3501+
border-left: 1px solid #d1d1d1;
3502+
padding-left: 20px;
3503+
}
3504+
.list-pf-chevron .fa,
3505+
.list-pf-select .fa {
34913506
font-size: 22px;
3492-
width: 20px;
3507+
}
3508+
.list-pf-content {
3509+
-ms-flex-align: start;
3510+
align-items: flex-start;
3511+
display: -ms-flexbox;
3512+
display: flex;
3513+
-ms-flex-positive: 1;
3514+
flex-grow: 1;
3515+
-ms-flex-wrap: nowrap;
3516+
flex-wrap: nowrap;
3517+
-ms-flex-pack: start;
3518+
justify-content: flex-start;
3519+
min-width: 0;
3520+
}
3521+
@media (min-width: 992px) {
3522+
.list-pf:not(.list-pf-stacked) .list-pf-content {
3523+
-ms-flex-align: center;
3524+
align-items: center;
3525+
}
3526+
}
3527+
.list-pf-left {
3528+
-ms-flex-positive: 0;
3529+
flex-grow: 0;
3530+
margin-left: 0;
3531+
margin-right: 20px;
3532+
}
3533+
.list-pf-icon {
3534+
-ms-flex-align: center;
3535+
align-items: center;
3536+
display: -ms-flexbox;
3537+
display: flex;
3538+
-ms-flex-pack: center;
3539+
justify-content: center;
3540+
}
3541+
.list-pf-icon-bordered {
3542+
border-radius: 50%;
3543+
border: 2px solid #39a5dc;
3544+
}
3545+
.list-pf-icon-small {
3546+
font-size: 1.4em;
3547+
height: 30px;
3548+
line-height: 30px;
3549+
width: 30px;
3550+
}
3551+
.list-pf-content-wrapper {
3552+
-ms-flex-align: center;
3553+
align-items: center;
3554+
display: -ms-flexbox;
3555+
display: flex;
3556+
-ms-flex-positive: 1;
3557+
flex-grow: 1;
3558+
-ms-flex-wrap: wrap;
3559+
flex-wrap: wrap;
3560+
min-width: 0;
3561+
}
3562+
@media (min-width: 992px) {
3563+
.list-pf-content-wrapper {
3564+
-ms-flex-wrap: nowrap;
3565+
flex-wrap: nowrap;
3566+
}
3567+
.list-pf-content-wrapper > * + * {
3568+
margin-left: 40px;
3569+
}
3570+
}
3571+
.list-pf-stacked .list-pf-content-wrapper {
3572+
-ms-flex-align: start;
3573+
align-items: flex-start;
3574+
}
3575+
.list-pf-main-content {
3576+
-ms-flex-align: center;
3577+
align-items: center;
3578+
display: -ms-flexbox;
3579+
display: flex;
3580+
-ms-flex-preferred-size: 70%;
3581+
flex-basis: 70%;
3582+
-ms-flex-positive: 1;
3583+
flex-grow: 1;
3584+
-ms-flex-negative: 1;
3585+
flex-shrink: 1;
3586+
-ms-flex-wrap: wrap;
3587+
flex-wrap: wrap;
3588+
min-width: 0;
3589+
}
3590+
@media (min-width: 992px) {
3591+
.list-pf:not(.list-pf-stacked) .list-pf-main-content {
3592+
-ms-flex-wrap: nowrap;
3593+
flex-wrap: nowrap;
3594+
width: auto;
3595+
}
3596+
.list-pf:not(.list-pf-stacked) .list-pf-main-content > * + * {
3597+
margin-left: 40px;
3598+
}
3599+
}
3600+
.list-pf-title {
3601+
-ms-flex-positive: 1;
3602+
flex-grow: 1;
3603+
-ms-flex-negative: 1;
3604+
flex-shrink: 1;
3605+
-ms-flex-preferred-size: 100%;
3606+
flex-basis: 100%;
3607+
font-weight: bold;
3608+
min-width: 0;
3609+
word-wrap: break-word;
3610+
}
3611+
.list-pf-description {
3612+
-ms-flex-positive: 1;
3613+
flex-grow: 1;
3614+
-ms-flex-negative: 1;
3615+
flex-shrink: 1;
3616+
-ms-flex-preferred-size: 100%;
3617+
flex-basis: 100%;
3618+
min-width: 0;
3619+
word-wrap: break-word;
3620+
}
3621+
.list-pf-additional-content {
3622+
display: -ms-flexbox;
3623+
display: flex;
3624+
-ms-flex-preferred-size: 31%;
3625+
flex-basis: 31%;
3626+
-ms-flex-positive: 1;
3627+
flex-grow: 1;
3628+
-ms-flex-negative: 1;
3629+
flex-shrink: 1;
3630+
-ms-flex-wrap: wrap;
3631+
flex-wrap: wrap;
3632+
-ms-flex-pack: justify;
3633+
justify-content: space-between;
3634+
}
3635+
.list-pf-actions {
3636+
display: -ms-flexbox;
3637+
display: flex;
3638+
-ms-flex-align: start;
3639+
align-items: flex-start;
3640+
-ms-flex-positive: 0;
3641+
flex-grow: 0;
3642+
margin-left: 40px;
3643+
}
3644+
.list-pf-actions > * + * {
3645+
margin-left: 10px;
34933646
}
34943647
.list-view-pf .list-group-item {
34953648
-ms-flex-align: start;

dist/docs/css/patternfly.css

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6890,8 +6890,7 @@ button.close {
68906890
:root .fa-rotate-270,
68916891
:root .fa-flip-horizontal,
68926892
:root .fa-flip-vertical {
6893-
-webkit-filter: none;
6894-
filter: none;
6893+
filter: none;
68956894
}
68966895
.fa-stack {
68976896
position: relative;
@@ -8945,6 +8944,12 @@ button.close {
89458944
overflow: visible;
89468945
clip: auto;
89478946
}
8947+
.text-overflow-pf {
8948+
overflow: hidden;
8949+
text-overflow: ellipsis;
8950+
white-space: nowrap;
8951+
word-wrap: normal;
8952+
}
89488953
.alert {
89498954
border-width: 1px;
89508955
padding-left: 47px;
-296 Bytes
Binary file not shown.

dist/docs/fonts/PatternFlyIcons-webfont.svg

Lines changed: 2 additions & 2 deletions
Loading
-296 Bytes
Binary file not shown.
-296 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.23.0",
5+
version: "3.23.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.23.0",
4+
"version": "3.23.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.23.0"
17+
"patternfly": "~3.23.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.23.0"
47+
"patternfly-eng-release": "~3.23.1"
4848
},
4949
"scripts": {
5050
"test": "grunt test"

0 commit comments

Comments
 (0)