Skip to content
This repository was archived by the owner on Jan 12, 2018. It is now read-only.

Commit 65d5450

Browse files
authored
Merge pull request #151 from skateman/convert-3.23.1
Converted from upstream version v3.23.1
2 parents 8aae033 + e17fef7 commit 65d5450

26 files changed

+711
-98
lines changed
-296 Bytes
Binary file not shown.

assets/fonts/patternfly/PatternFlyIcons-webfont.svg

Lines changed: 2 additions & 2 deletions
Loading
-296 Bytes
Binary file not shown.
-296 Bytes
Binary file not shown.

assets/javascripts/patternfly-settings.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

assets/javascripts/patternfly-settings.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/javascripts/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

assets/javascripts/patternfly.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/stylesheets/patternfly/_icons.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
content: $pficon-var-enterprise;
8484
}
8585
.#{$icon-prefix}-equalizer:before {
86-
content: $pficon-var-enterprise;
86+
content: $pficon-var-equalizer;
8787
}
8888
.#{$icon-prefix}-error-circle-o:before {
8989
color: $brand-danger;

assets/stylesheets/patternfly/_list-pf.scss

Lines changed: 133 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
// PatternFly List
33
// --------------------------------------------------
44

5+
$list-pf-main-content-width: 70%; // sets the proportional width of the main content vs the additional content
6+
57
.list-pf {
68
border-bottom: 1px solid $list-pf-border-color;
79
}
810

911
.list-pf-item {
1012
border-color: $list-pf-border-color;
11-
border-left-color: #fff;
12-
border-right-color: #fff;
13+
border-left-color: $color-pf-white;
14+
border-right-color: $color-pf-white;
1315
border-style: solid;
1416
border-width: 1px;
1517
border-bottom: none;
@@ -25,26 +27,148 @@
2527
}
2628

2729
.list-pf-expansion {
28-
background-color: #fff;
30+
background-color: $color-pf-white;
2931
}
3032

3133
.list-pf-container {
32-
align-items: center;
34+
align-items: flex-start;
3335
display: flex;
3436
padding: $list-pf-padding;
3537
.list-pf-expansion & {
3638
border-top: 1px solid $list-pf-active-border-color;
3739
}
40+
// when wide enough, if the list is not stacked, then center items vertically
41+
@media (min-width: $screen-md-min) {
42+
.list-pf:not(.list-pf-stacked) & {
43+
align-items: center;
44+
}
45+
}
3846
}
3947

40-
.list-pf-chevron {
41-
margin-right: 5px;
48+
.list-pf-chevron,
49+
.list-pf-select {
50+
margin-right: 10px;
51+
//add the divider line if there is a chevron or a select
4252
+ .list-pf-content {
43-
border-left: 1px solid $list-pf-active-border-color;
44-
padding-left: 15px;
53+
border-left: 1px solid $color-pf-black-300;
54+
padding-left: ($grid-gutter-width/2);
4555
}
4656
.fa {
4757
font-size: 22px;
48-
width: 20px;
4958
}
5059
}
60+
61+
.list-pf-content {
62+
align-items: flex-start;
63+
display:flex;
64+
flex-grow: 1;
65+
flex-wrap: nowrap;
66+
justify-content: flex-start;
67+
min-width: 0;
68+
// when wide enough, if the list is not stacked, then center items vertically
69+
@media (min-width: $screen-md-min) {
70+
.list-pf:not(.list-pf-stacked) & {
71+
align-items: center;
72+
}
73+
}
74+
}
75+
76+
.list-pf-left {
77+
flex-grow: 0;
78+
margin-left: 0;
79+
margin-right: ($grid-gutter-width/2);
80+
}
81+
.list-pf-icon {
82+
align-items: center;
83+
display:flex;
84+
justify-content: center;
85+
}
86+
.list-pf-icon-bordered {
87+
border-radius: 50%;
88+
border: 2px solid $list-view-accented-border;
89+
}
90+
.list-pf-icon-small {
91+
font-size: 1.4em;
92+
height: 30px;
93+
line-height: 30px;
94+
width: 30px;
95+
}
96+
97+
98+
.list-pf-content-wrapper {
99+
align-items: center;
100+
display:flex;
101+
flex-grow: 1;
102+
flex-wrap: wrap;
103+
min-width: 0;
104+
// when at larger breakpoints, don't stack the contents and add some space between the children
105+
@media (min-width: $screen-md-min) {
106+
flex-wrap: nowrap;
107+
& > * + * {
108+
margin-left: $grid-gutter-width;
109+
}
110+
}
111+
// if the list is stacked, then align the contents to the top
112+
.list-pf-stacked & {
113+
align-items: flex-start;
114+
}
115+
116+
}
117+
118+
.list-pf-main-content {
119+
align-items: center;
120+
display: flex;
121+
flex-basis: $list-pf-main-content-width;
122+
flex-grow: 1;
123+
flex-shrink: 1;
124+
flex-wrap: wrap;
125+
min-width: 0;
126+
}
127+
128+
// at larger breakpoints, if the list is not stacked, then don't wrap the main contents and add some space between them
129+
.list-pf:not(.list-pf-stacked) .list-pf-main-content {
130+
@media (min-width: $screen-md-min) {
131+
flex-wrap: nowrap;
132+
width: auto;
133+
& > * + * {
134+
margin-left: $grid-gutter-width;
135+
}
136+
}
137+
}
138+
139+
// Title and description are break-word wrapped; add .text-overflow-pf to truncate and ellipse instead
140+
.list-pf-title {
141+
flex-grow: 1;
142+
flex-shrink: 1;
143+
flex-basis: 100%;
144+
font-weight: bold;
145+
min-width: 0;
146+
word-wrap: break-word;
147+
}
148+
.list-pf-description {
149+
flex-grow: 1;
150+
flex-shrink: 1;
151+
flex-basis: 100%;
152+
min-width: 0;
153+
word-wrap: break-word;
154+
}
155+
156+
.list-pf-additional-content {
157+
display: flex;
158+
flex-basis: ((100% - $list-pf-main-content-width) + 1%); // this adjusts the proportions but adding up to > 100% allows for proper wrapping
159+
flex-grow: 1;
160+
flex-shrink: 1;
161+
flex-wrap: wrap;
162+
justify-content: space-between;
163+
}
164+
.list-pf-actions {
165+
display: flex;
166+
align-items: flex-start;
167+
flex-grow: 0;
168+
margin-left: $grid-gutter-width;
169+
//by default, space contents apart
170+
& > * + * {
171+
margin-left: ($grid-gutter-width / 4);
172+
}
173+
174+
}

0 commit comments

Comments
 (0)