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

Commit 41588a6

Browse files
authored
Merge pull request #141 from skateman/convert-3.13.0
Converted from upstream version 3.13.0
2 parents d1b13cf + aaac50f commit 41588a6

34 files changed

+758
-458
lines changed
740 Bytes
Binary file not shown.

assets/fonts/patternfly/PatternFlyIcons-webfont.svg

Lines changed: 2 additions & 0 deletions
Loading
740 Bytes
Binary file not shown.
740 Bytes
Binary file not shown.

assets/javascripts/patternfly.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
}
172172

173173
iNewStart = oSettings._iDisplayLength * (this.value - 1);
174-
if (iNewStart > oSettings.fnRecordsDisplay()) {
174+
if (iNewStart >= oSettings.fnRecordsDisplay()) {
175175
/* Display overrun */
176176
oSettings._iDisplayStart = (Math.ceil((oSettings.fnRecordsDisplay() - 1) /
177177
oSettings._iDisplayLength) - 1) * oSettings._iDisplayLength;
@@ -1568,6 +1568,10 @@
15681568
},
15691569

15701570
init = function (handleItemSelections) {
1571+
// Hide the nav menus during initialization
1572+
navElement.addClass('hide-nav-pf');
1573+
bodyContentElement.addClass('hide-nav-pf');
1574+
15711575
//Set correct state on load
15721576
checkNavState();
15731577

assets/javascripts/patternfly.min.js

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

assets/stylesheets/patternfly/_forms.scss

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,23 @@ label {
7373
span.required-pf {
7474
color: $brand-danger;
7575
}
76+
77+
.fields-section-pf {
78+
border-color: $color-pf-black-200;
79+
border-style: solid;
80+
border-width: 1px 0 0;
81+
margin-top: 25px;
82+
padding: 15px 0 0;
83+
}
84+
.fields-section-header-pf {
85+
border: none;
86+
font-size: $font-size-base;
87+
margin: 0;
88+
padding-right: $padding-large-horizontal;
89+
width: auto;
90+
.fa-angle-right {
91+
cursor: pointer;
92+
font-size: $font-size-large;
93+
width: $font-size-large;
94+
}
95+
}

assets/stylesheets/patternfly/_icons.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@
6767
.#{$icon-prefix}-delete:before {
6868
content: $pficon-var-delete;
6969
}
70+
.#{$icon-prefix}-domain:before {
71+
content: $pficon-var-domain;
72+
}
7073
.#{$icon-prefix}-edit:before {
7174
content: $pficon-var-edit;
7275
}
@@ -170,6 +173,9 @@
170173
.#{$icon-prefix}-server:before {
171174
content: $pficon-var-server;
172175
}
176+
.#{$icon-prefix}-server-group:before {
177+
content: $pficon-var-server-group;
178+
}
173179
.#{$icon-prefix}-service:before {
174180
content: $pficon-var-service;
175181
}

assets/stylesheets/patternfly/_variables.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ $pficon-var-cluster: "\e620" !def
157157
$pficon-var-container-node: "\e621" !default;
158158
$pficon-var-cpu: "\e905" !default;
159159
$pficon-var-delete: "\e611" !default;
160+
$pficon-var-domain: "\e919" !default;
160161
$pficon-var-edit: "\e60a" !default;
161162
$pficon-var-enterprise: "\e906" !default;
162163
$pficon-var-error-circle-o: "\e61d" !default;
@@ -192,6 +193,7 @@ $pficon-var-running: "\e614" !def
192193
$pficon-var-save: "\e601" !default;
193194
$pficon-var-screen: "\e600" !default;
194195
$pficon-var-server: "\e90d" !default;
196+
$pficon-var-server-group: "\e91a" !default;
195197
$pficon-var-service: "\e61e" !default;
196198
$pficon-var-settings: "\e610" !default;
197199
$pficon-var-storage-domain: "\e90e" !default;

assets/stylesheets/patternfly/_vertical-nav.scss

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
box-shadow: 0 0 3px rgba($color-pf-black, 0.15);
5353
display: block !important;
5454
}
55-
.hide-nav-pf { // Used to hide navigation initially to avoid startup flicker
55+
&.hide-nav-pf { // Used to hide navigation initially to avoid startup flicker
5656
visibility: hidden !important;
5757
}
5858
.list-group {
@@ -77,6 +77,11 @@
7777
position: relative;
7878
white-space: nowrap;
7979
width: $nav-pf-vertical-width;
80+
// When flexbox is supported nav item names take up all available space
81+
@supports (display: flex) {
82+
display: flex;
83+
padding-right: 0;
84+
}
8085
.fa,
8186
.glyphicon,
8287
.pficon {
@@ -124,6 +129,12 @@
124129
display: block;
125130
line-height: 25px;
126131
max-width: 120px;
132+
// If flexbox is supported, do not set max-width, take all space with just some right padding
133+
@supports (display: flex) {
134+
flex: 1;
135+
max-width: none;
136+
padding-right: 15px;
137+
}
127138
overflow: hidden;
128139
text-overflow: ellipsis;
129140
}
@@ -163,6 +174,16 @@
163174
position: absolute;
164175
right: 15px;
165176
top: 20px;
177+
// If flexbox is supported, use relative positioning to place to the right of the label
178+
// and adjust the top position so that the secondary and tertiary nav items don't need to change
179+
@supports (display: flex) {
180+
padding-left: 0;
181+
padding-right: 15px;
182+
position: relative;
183+
right: 0;
184+
margin-top: -3px;
185+
top: 5px;
186+
}
166187
.badge {
167188
background: $nav-pf-vertical-badge-bg-color;
168189
color: $nav-pf-vertical-badge-color;
@@ -317,6 +338,12 @@
317338
right: 20px;
318339
top: 0;
319340
}
341+
.list-group-item-value {
342+
// If flex box is supported add some padding to account for the submenu indicator
343+
@supports (display: flex) {
344+
padding-right: 35px;
345+
}
346+
}
320347
}
321348
&.active,
322349
&:hover {
@@ -596,6 +623,12 @@
596623
right: 20px;
597624
top: 4px;
598625
}
626+
// If flex box is supported add some padding to account for the submenu indicator
627+
.list-group-item-value {
628+
@supports (display: flex) {
629+
padding-right: 35px;
630+
}
631+
}
599632
}
600633
&.active,
601634
&:hover {

0 commit comments

Comments
 (0)