Skip to content

Commit 672cb4d

Browse files
Merge branch 'master-local' into master-dist
2 parents 9d3aa8f + 5b0bd90 commit 672cb4d

File tree

76 files changed

+4263
-4679
lines changed

Some content is hidden

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

76 files changed

+4263
-4679
lines changed

dist/angular-patternfly.js

+1
Original file line numberDiff line numberDiff line change
@@ -15960,6 +15960,7 @@ angular.module('patternfly.pagination').component('pfPagination', {
1596015960

1596115961
ctrl.selectAll = false;
1596215962
ctrl.dtInstance = {};
15963+
ctrl.dropdownClass = 'dropdown';
1596315964

1596415965
ctrl.defaultDtOptions = {
1596515966
autoWidth: false,

dist/angular-patternfly.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/docs/css/angular-patternfly.css

+3
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,9 @@ table.dataTable tbody td {
718718
.table-view-pf-select {
719719
width: 13px;
720720
}
721+
.table-view-pf-actions .dropup {
722+
height: 100%;
723+
}
721724
.wizard-pf-footer .btn-cancel.wizard-pf-cancel-no-back {
722725
margin-right: 0;
723726
}

dist/docs/css/patternfly-additions.css

+72-18
Original file line numberDiff line numberDiff line change
@@ -2161,6 +2161,27 @@ select.selectpicker {
21612161
white-space: nowrap;
21622162
word-wrap: normal;
21632163
}
2164+
.fixed-height-accordion-pf {
2165+
display: -ms-flexbox;
2166+
display: flex;
2167+
-ms-flex-direction: column;
2168+
flex-direction: column;
2169+
}
2170+
.fixed-height-accordion-pf .panel {
2171+
display: -ms-flexbox;
2172+
display: flex;
2173+
-ms-flex-direction: column;
2174+
flex-direction: column;
2175+
}
2176+
.fixed-height-accordion-pf .panel.panel-open {
2177+
-ms-flex: 1;
2178+
flex: 1;
2179+
}
2180+
.fixed-height-accordion-pf .panel .collapse.in {
2181+
-ms-flex: 1;
2182+
flex: 1;
2183+
overflow-y: auto;
2184+
}
21642185
.about-modal-pf {
21652186
background-color: #292e34;
21662187
background-image: url("../img/bg-modal-about-pf.png");
@@ -2638,11 +2659,27 @@ select.selectpicker {
26382659
.blank-slate-pf .blank-slate-pf-secondary-action {
26392660
margin-top: 20px;
26402661
}
2662+
.blank-slate-pf .blank-slate-pf-secondary-action a {
2663+
display: inline-block;
2664+
padding: 5px 15px;
2665+
}
2666+
.blank-slate-pf .blank-slate-pf-secondary-action a + a:before {
2667+
background-color: #8b8d8f;
2668+
content: "";
2669+
display: inline-block;
2670+
height: 10px;
2671+
left: calc(-15px - 2px);
2672+
position: relative;
2673+
width: 1px;
2674+
}
26412675
.blank-slate-pf button {
2642-
margin-right: 5px;
2676+
margin-bottom: 5px;
26432677
}
2644-
.blank-slate-pf button:last-of-type {
2645-
margin-right: 0;
2678+
.blank-slate-pf.blank-slate-content-pf {
2679+
background: transparent;
2680+
border: 0;
2681+
padding: 0;
2682+
margin: 20px;
26462683
}
26472684
.combobox-container.combobox-selected .glyphicon-remove {
26482685
display: inline-block;
@@ -4239,6 +4276,10 @@ fieldset[disabled] .btn-experimental-pf.active {
42394276
.filter-pf-select-dropdown .caret {
42404277
font-style: normal;
42414278
}
4279+
.filter-pf-select-dropdown.filter-selected {
4280+
font-style: normal;
4281+
color: inherit;
4282+
}
42424283
.filter-pf-active-label {
42434284
margin-right: 5px;
42444285
}
@@ -4348,6 +4389,9 @@ fieldset[disabled] .btn-experimental-pf.active {
43484389
.pficon-domain:before {
43494390
content: "\e919";
43504391
}
4392+
.pficon-drag-drop:before {
4393+
content: "\e950";
4394+
}
43514395
.pficon-edit:before {
43524396
content: "\e60a";
43534397
}
@@ -5680,14 +5724,17 @@ a.disabled {
56805724
.login-pf .container .submit {
56815725
text-align: right;
56825726
}
5727+
.login-pf-page {
5728+
padding-top: 20px;
5729+
}
56835730
.login-pf-page .login-pf-brand {
5684-
margin-top: 20px;
5731+
margin-top: 0px;
56855732
max-width: 360px;
56865733
width: 70%;
56875734
}
56885735
@media (min-width: 768px) {
56895736
.login-pf-page .login-pf-brand {
5690-
margin-top: 62px;
5737+
margin-top: 22px;
56915738
}
56925739
}
56935740
.login-pf-page .login-pf-page-header {
@@ -5743,11 +5790,10 @@ a.disabled {
57435790
}
57445791
@media (min-width: 768px) {
57455792
.login-pf-page .login-pf-header {
5746-
margin-bottom: 30px;
5793+
margin-bottom: 10px;
57475794
}
57485795
}
5749-
.login-pf-page .login-pf-header h1,
5750-
.login-pf-page .login-pf-header p {
5796+
.login-pf-page .login-pf-header h1 {
57515797
text-align: center;
57525798
}
57535799
.login-pf-page .login-pf-header h1 {
@@ -5799,6 +5845,12 @@ a.disabled {
57995845
justify-content: center;
58005846
-ms-flex-wrap: wrap;
58015847
flex-wrap: wrap;
5848+
padding-bottom: 50px;
5849+
}
5850+
@media (min-width: 768px) {
5851+
.login-pf-page .login-pf-page-footer {
5852+
padding-bottom: 100px;
5853+
}
58025854
}
58035855
.login-pf-page .login-pf-page-footer-links {
58045856
display: -ms-flexbox;
@@ -7650,16 +7702,18 @@ table.dataTable th:active {
76507702
.bootstrap-datetimepicker-widget .today-button-pf:before {
76517703
content: "Today";
76527704
}
7653-
.bootstrap-datetimepicker-widget.timepicker-sbs .datepicker,
7654-
.bootstrap-datetimepicker-widget.timepicker-sbs .accordion-toggle {
7655-
border-right: 1px solid #d1d1d1;
7656-
}
7657-
.bootstrap-datetimepicker-widget.timepicker-sbs .timepicker {
7658-
padding-left: 0;
7659-
margin-top: 50px;
7660-
}
7661-
.bootstrap-datetimepicker-widget.timepicker-sbs .picker-switch {
7662-
width: 50%;
7705+
@media (min-width: 992px) {
7706+
.bootstrap-datetimepicker-widget.timepicker-sbs .datepicker,
7707+
.bootstrap-datetimepicker-widget.timepicker-sbs .accordion-toggle {
7708+
border-right: 1px solid #d1d1d1;
7709+
}
7710+
.bootstrap-datetimepicker-widget.timepicker-sbs .timepicker {
7711+
padding-left: 0;
7712+
margin-top: 50px;
7713+
}
7714+
.bootstrap-datetimepicker-widget.timepicker-sbs .picker-switch {
7715+
width: 50%;
7716+
}
76637717
}
76647718
.bootstrap-datetimepicker-widget a[data-action] {
76657719
border: 0;
344 Bytes
Binary file not shown.

dist/docs/fonts/PatternFlyIcons-webfont.svg

+1
Loading
344 Bytes
Binary file not shown.
344 Bytes
Binary file not shown.

dist/docs/grunt-scripts/angular-patternfly.js

+1
Original file line numberDiff line numberDiff line change
@@ -15960,6 +15960,7 @@ angular.module('patternfly.pagination').component('pfPagination', {
1596015960

1596115961
ctrl.selectAll = false;
1596215962
ctrl.dtInstance = {};
15963+
ctrl.dropdownClass = 'dropdown';
1596315964

1596415965
ctrl.defaultDtOptions = {
1596515966
autoWidth: false,

0 commit comments

Comments
 (0)