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

Commit d1b13cf

Browse files
authored
Merge pull request #140 from skateman/convert-3.12
Converted from upstream version 3.12.0
2 parents 7c7cbd8 + 7eb0bf1 commit d1b13cf

38 files changed

+4135
-820
lines changed

assets/stylesheets/patternfly/_bootstrap-treeview.scss

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,19 @@
1010
background: transparent;
1111
border-bottom: 1px solid transparent !important;
1212
border-top: 1px solid transparent !important;
13+
cursor: default !important;
1314
margin-bottom: 0;
1415
overflow: hidden;
1516
padding: 0 10px;
1617
text-overflow: ellipsis;
1718
white-space: nowrap;
18-
1919
&:hover {
20-
background: $dropdown-link-hover-bg !important;
21-
border-color: $dropdown-link-hover-border-color !important;
20+
background: none !important;
2221
}
2322
&.node-selected {
24-
background: $dropdown-link-active-bg !important;
25-
border-color: $dropdown-link-active-border-color !important;
26-
color: $dropdown-link-active-color !important;
23+
background: none !important;
24+
border-color: transparent !important;
25+
color: inherit !important;
2726
}
2827
&.node-check-changed {
2928
span.node-icon,
@@ -43,6 +42,9 @@
4342
&.check-icon {
4443
margin-right: 10px;
4544
}
45+
&.expand-icon {
46+
cursor: pointer !important;
47+
}
4648
}
4749
span.image {
4850
background-repeat: no-repeat;
@@ -60,8 +62,28 @@
6062
.node-disabled {
6163
color: $color-pf-black-300;
6264
cursor: not-allowed;
65+
span.expand-icon {
66+
cursor: default !important;
67+
}
6368
}
6469
.node-hidden {
6570
display:none;
6671
}
6772
}
73+
74+
.treeview-pf-hover .list-group-item {
75+
cursor: pointer !important;
76+
&:hover {
77+
background-color: $dropdown-link-hover-bg !important;
78+
border-color: $dropdown-link-hover-border-color !important;
79+
}
80+
}
81+
82+
.treeview-pf-select .list-group-item {
83+
cursor: pointer !important;
84+
&.node-selected {
85+
background: $dropdown-link-active-bg !important;
86+
border-color: $dropdown-link-active-border-color !important;
87+
color: $dropdown-link-active-color !important;
88+
}
89+
}

assets/stylesheets/patternfly/_dropdowns.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,17 @@
7878
border-color: transparent;
7979
}
8080
}
81+
82+
// Selected state
83+
.dropdown-menu > .selected > a {
84+
background-color: $dropdown-link-active-bg;
85+
border-color: $dropdown-link-active-border-color;
86+
color: $color-pf-white;
87+
small {
88+
color: rgba($color-pf-white, 0.5);
89+
}
90+
}
91+
8192
// Nuke hover/focus effects
8293
.dropdown-menu > .disabled > a {
8394
&:hover,

assets/stylesheets/patternfly/_forms.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
color: $brand-danger;
1111
}
1212

13+
.fields-status-pf {
14+
color: $color-pf-black-500;
15+
margin-bottom: 15px;
16+
}
17+
1318
.form-control {
1419
&[disabled],
1520
&[readonly],
@@ -58,4 +63,13 @@
5863

5964
label {
6065
font-weight: 600;
66+
&.required-pf:after {
67+
color: $brand-danger;
68+
content: "*";
69+
margin-left: 3px;
70+
}
71+
}
72+
73+
span.required-pf {
74+
color: $brand-danger;
6175
}

assets/stylesheets/patternfly/_list-view.scss

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,38 @@
66
.list-view-pf {
77
.list-group-item {
88
align-items: flex-start;
9+
background-clip: padding-box;
10+
border-color: transparent #fff;
11+
border-style: solid;
12+
border-width: 1px;
913
@include clearfix; //IE9 fallback
1014
display: flex;
15+
flex-wrap: wrap;
1116
padding-bottom: 0;
1217
padding-top: 0;
18+
&.list-view-pf-expand-active {
19+
background-color: $list-view-hover-bg;
20+
}
1321
&.active {
1422
color: $list-group-link-color;
1523
background-color: $list-view-active-bg;
24+
background-clip: border-box;
25+
border-color: $color-pf-blue-300 transparent transparent;
1626
z-index:auto;
1727
}
1828
&:hover {
1929
background-color: $list-view-hover-bg;
30+
border-left-color: transparent;
31+
border-right-color: transparent;
32+
}
33+
&.list-view-pf-expand-active {
34+
border: solid 1px $list-group-active-border;
35+
&:first-child {
36+
border-top-color: $color-pf-blue-300;
37+
}
38+
}
39+
&:first-child {
40+
border-top: 1px solid transparent;
2041
}
2142
@media (min-width: $screen-md-min) {
2243
align-items: center;
@@ -230,5 +251,47 @@
230251
}
231252
}
232253
.list-view-pf-view {
254+
background: $list-group-top-border;
255+
border: none;
233256
margin-top: 30px;
234257
}
258+
.list-group-item-header {
259+
box-sizing: content-box;
260+
cursor: pointer;
261+
margin: 0 -15px;
262+
padding: 0 15px; //filling the width of the list item
263+
width: 100%;
264+
}
265+
.list-view-pf-expand {
266+
cursor: pointer;
267+
float: left; //IE9 fallback
268+
margin-bottom: ($grid-gutter-width/2);
269+
margin-right: 2px;
270+
margin-top: ($grid-gutter-width/2);
271+
padding: 3px 0;
272+
&.active,
273+
&:hover {
274+
color: $link-color;
275+
}
276+
.list-view-pf-additional-info-item & {
277+
margin: 0;
278+
padding: 0;
279+
}
280+
.fa-angle-right {
281+
cursor: pointer;
282+
font-size: ($font-size-large+3);
283+
margin-right: 5px;
284+
margin-top: 2px;
285+
width: 10px;
286+
}
287+
}
288+
.list-group-item-container {
289+
background: #fff;
290+
border-top: solid 1px $list-group-active-border;
291+
box-sizing: content-box;
292+
margin: -1px -15px 0;
293+
order: 3;
294+
padding: 10px 15px;
295+
position: relative;
296+
width: 100%;
297+
}

assets/stylesheets/patternfly/_toolbar.scss

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
background: $color-pf-white;
7272
border: solid 1px $color-pf-black-400;
7373
display: none;
74-
left: -200px;
74+
right: -20px;
7575
padding: 5px;
7676
position: absolute;
7777
top: 35px;
@@ -91,27 +91,35 @@
9191
border-bottom:11px solid $color-pf-black-400;
9292
border-left:11px solid transparent;
9393
border-right:11px solid transparent;
94-
left: 215px;
94+
right: 35px;
95+
.toolbar-pf-find:last-child & {
96+
right: 15px;
97+
}
9598
top: -12px;
9699
@media (max-width: $grid-float-breakpoint) {
97100
border-bottom:11px solid transparent;
98101
border-right:11px solid $color-pf-black-400;
99102
border-top:11px solid transparent;
100103
left: -22px;
104+
right: initial;
101105
top: 8px;
102106
}
103107
}
104108
&:after {
105109
border-bottom:10px solid $color-pf-white;
106110
border-left:10px solid transparent;
107111
border-right:10px solid transparent;
108-
left: 216px;
112+
right: 36px;
113+
.toolbar-pf-find:last-child & {
114+
right: 16px;
115+
}
109116
top: -10px;
110117
@media (max-width: $grid-float-breakpoint) {
111118
border-bottom:10px solid transparent;
112119
border-right:10px solid $color-pf-white;
113120
border-top:10px solid transparent;
114121
left: -20px;
122+
right: initial;
115123
top: 9px;
116124
}
117125
}

assets/stylesheets/patternfly/_wizard.scss

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,34 @@
11
//
22
// Wizard
33
// --------------------------------------------------
4+
.wizard-pf {
5+
height:100%;
6+
margin: 0 auto;
7+
max-height: 900px;
8+
padding: 10px;
9+
width: auto;
10+
.modal-content {
11+
height:100%;
12+
}
13+
}
414

515
// Wizard header
616
// Top section of the wizard w/ title and dismiss
717

818
.wizard-pf-body {
919
padding: 0;
20+
position: static;
1021
}
1122
/* styles the sidebard containing the sub-steps */
1223
.wizard-pf-sidebar {
1324
background: $color-pf-black-100;
1425
border-right: 1px solid $color-pf-black-300;
1526
bottom: 0;
16-
display: table-cell;
1727
left: 0;
1828
overflow-x: hidden;
1929
overflow-y: auto;
20-
position: relative;
30+
position: absolute;
2131
top: 0;
22-
vertical-align: top;
23-
2432
.list-group {
2533
border-top: 0;
2634
margin-bottom: 0;
@@ -41,7 +49,7 @@
4149
padding-left: 20px;
4250
position: relative;
4351
white-space: nowrap;
44-
width: 18em;
52+
width: 14em;
4553
&:hover {
4654
text-decoration: none;
4755
}
@@ -99,7 +107,7 @@
99107
/* styles the steps indicator across the top of the wizard */
100108
.wizard-pf-steps {
101109
border-bottom: solid 1px $color-pf-black-300;
102-
text-align:center;
110+
text-align: center;
103111
}
104112
.wizard-pf-steps-indicator {
105113
font-size: ceil(($font-size-base * 1.3333));
@@ -192,10 +200,13 @@
192200

193201
/* styles the main content portion of the wizard */
194202
.wizard-pf-main {
195-
display: table-cell;
203+
// display: table-cell;
204+
height: 100%;
205+
margin-left: 253px; /* this value is updated by js */
206+
overflow: auto;
196207
padding: 3em;
197208
vertical-align: top;
198-
width: 10000px;
209+
// width: 10000px;
199210
.blank-slate-pf {
200211
background-color: transparent;
201212
border: none;
@@ -322,10 +333,35 @@
322333
/* styles the footer */
323334
.wizard-pf-footer {
324335
border-top: 1px solid $color-pf-black-300;
336+
bottom: 0;
337+
left: 0;
325338
margin-top: 0;
326339
padding-bottom: 17px;
340+
position: absolute;
341+
right: 0;
327342

328343
.btn-cancel {
329344
margin-right:25px;
330345
}
331346
}
347+
348+
.wizard-pf-row {
349+
bottom: 58px; /* this value is updated by js */
350+
position: absolute;
351+
overflow: hidden;
352+
top: 172px; /* this value is updated by js */
353+
width:100%;
354+
}
355+
356+
// Scale up the modal
357+
@media (min-width: $screen-md-min) {
358+
// increasing space around modal for larger viewports
359+
.wizard-pf {
360+
padding: 30px 0;
361+
width: 900px;
362+
}
363+
// increasing width of sidebar for larger viewports
364+
.wizard-pf-sidebar .list-group-item > a {
365+
width: 18em;
366+
}
367+
}

assets/stylesheets/patternfly/lib/bootstrap-datetimepicker.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
.bootstrap-datetimepicker-widget.dropdown-menu.bottom:before {
3636
border-left: 7px solid transparent;
3737
border-right: 7px solid transparent;
38-
border-bottom: 7px solid #cccccc;
38+
border-bottom: 7px solid #ccc;
3939
border-bottom-color: rgba(0, 0, 0, 0.2);
4040
top: -7px;
4141
left: 7px;
@@ -50,7 +50,7 @@
5050
.bootstrap-datetimepicker-widget.dropdown-menu.top:before {
5151
border-left: 7px solid transparent;
5252
border-right: 7px solid transparent;
53-
border-top: 7px solid #cccccc;
53+
border-top: 7px solid #ccc;
5454
border-top-color: rgba(0, 0, 0, 0.2);
5555
bottom: -7px;
5656
left: 6px;
@@ -310,7 +310,7 @@
310310
.bootstrap-datetimepicker-widget table td.active,
311311
.bootstrap-datetimepicker-widget table td.active:hover {
312312
background-color: #337ab7;
313-
color: #ffffff;
313+
color: #fff;
314314
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
315315
}
316316
.bootstrap-datetimepicker-widget table td.active.today:before {
@@ -336,7 +336,7 @@
336336
}
337337
.bootstrap-datetimepicker-widget table td span.active {
338338
background-color: #337ab7;
339-
color: #ffffff;
339+
color: #fff;
340340
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
341341
}
342342
.bootstrap-datetimepicker-widget table td span.old {

0 commit comments

Comments
 (0)