Skip to content

Commit 7269d40

Browse files
Merge branch 'master' into master-dist
2 parents d4937fc + 1da4525 commit 7269d40

File tree

50 files changed

+118
-52
lines changed

Some content is hidden

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

50 files changed

+118
-52
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.12.0",
3+
"version": "3.13.0",
44
"authors": [
55
"Red Hat"
66
],
@@ -42,7 +42,7 @@
4242
"angular-sanitize": "1.3.0 - 1.5.*",
4343
"angular-bootstrap": "0.13.x",
4444
"lodash": "3.x",
45-
"patternfly": "~3.12.0"
45+
"patternfly": "~3.13.0"
4646
},
4747
"devDependencies": {
4848
"angular-mocks": "1.3.0 - 1.5.*"

dist/docs/css/patternfly-additions.css

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3040,6 +3040,9 @@ table.datatable th:active {
30403040
.pficon-delete:before {
30413041
content: "\e611";
30423042
}
3043+
.pficon-domain:before {
3044+
content: "\e919";
3045+
}
30433046
.pficon-edit:before {
30443047
content: "\e60a";
30453048
}
@@ -3143,6 +3146,9 @@ table.datatable th:active {
31433146
.pficon-server:before {
31443147
content: "\e90d";
31453148
}
3149+
.pficon-server-group:before {
3150+
content: "\e91a";
3151+
}
31463152
.pficon-service:before {
31473153
content: "\e61e";
31483154
}
@@ -5650,7 +5656,7 @@ a.disabled {
56505656
box-shadow: 0 0 3px rgba(3, 3, 3, 0.15);
56515657
display: block !important;
56525658
}
5653-
.nav-pf-vertical .hide-nav-pf {
5659+
.nav-pf-vertical.hide-nav-pf {
56545660
visibility: hidden !important;
56555661
}
56565662
.nav-pf-vertical .list-group {
@@ -5677,6 +5683,13 @@ a.disabled {
56775683
white-space: nowrap;
56785684
width: 200px;
56795685
}
5686+
@supports (display: flex) {
5687+
.nav-pf-vertical .list-group-item > a {
5688+
display: -ms-flexbox;
5689+
display: flex;
5690+
padding-right: 0;
5691+
}
5692+
}
56805693
.nav-pf-vertical .list-group-item > a .fa,
56815694
.nav-pf-vertical .list-group-item > a .glyphicon,
56825695
.nav-pf-vertical .list-group-item > a .pficon {
@@ -5725,6 +5738,14 @@ a.disabled {
57255738
overflow: hidden;
57265739
text-overflow: ellipsis;
57275740
}
5741+
@supports (display: flex) {
5742+
.nav-pf-vertical .list-group-item .list-group-item-value {
5743+
-ms-flex: 1;
5744+
flex: 1;
5745+
max-width: none;
5746+
padding-right: 15px;
5747+
}
5748+
}
57285749
.nav-pf-vertical .list-group-item-separator {
57295750
border-top-color: #030303;
57305751
border-top-width: 2px;
@@ -5755,6 +5776,16 @@ a.disabled {
57555776
right: 15px;
57565777
top: 20px;
57575778
}
5779+
@supports (display: flex) {
5780+
.nav-pf-vertical .badge-container-pf {
5781+
padding-left: 0;
5782+
padding-right: 15px;
5783+
position: relative;
5784+
right: 0;
5785+
margin-top: -3px;
5786+
top: 5px;
5787+
}
5788+
}
57585789
.nav-pf-vertical .badge-container-pf .badge {
57595790
background: #292e34;
57605791
color: #fff;
@@ -5898,6 +5929,11 @@ a.disabled {
58985929
right: 20px;
58995930
top: 0;
59005931
}
5932+
@supports (display: flex) {
5933+
.secondary-nav-item-pf > a .list-group-item-value {
5934+
padding-right: 35px;
5935+
}
5936+
}
59015937
.secondary-nav-item-pf.active > a,
59025938
.secondary-nav-item-pf:hover > a {
59035939
width: calc(200px + 1px);
@@ -6150,6 +6186,11 @@ a.disabled {
61506186
right: 20px;
61516187
top: 4px;
61526188
}
6189+
@supports (display: flex) {
6190+
.nav-pf-secondary-nav .list-group-item.tertiary-nav-item-pf > a .list-group-item-value {
6191+
padding-right: 35px;
6192+
}
6193+
}
61536194
.nav-pf-secondary-nav .list-group-item.tertiary-nav-item-pf.active > a,
61546195
.nav-pf-secondary-nav .list-group-item.tertiary-nav-item-pf:hover > a {
61556196
width: calc(200px - 19px);

dist/docs/css/patternfly.css

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9394,6 +9394,25 @@ label.required-pf:after {
93949394
span.required-pf {
93959395
color: #cc0000;
93969396
}
9397+
.fields-section-pf {
9398+
border-color: #ededed;
9399+
border-style: solid;
9400+
border-width: 1px 0 0;
9401+
margin-top: 25px;
9402+
padding: 15px 0 0;
9403+
}
9404+
.fields-section-header-pf {
9405+
border: none;
9406+
font-size: 12px;
9407+
margin: 0;
9408+
padding-right: 10px;
9409+
width: auto;
9410+
}
9411+
.fields-section-header-pf .fa-angle-right {
9412+
cursor: pointer;
9413+
font-size: 14px;
9414+
width: 14px;
9415+
}
93979416
.label {
93989417
border-radius: 0;
93999418
font-size: 100%;
740 Bytes
Binary file not shown.

dist/docs/fonts/PatternFlyIcons-webfont.svg

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

dist/docs/grunt-scripts/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

dist/docs/partials/api/patternfly.autofocus.pfFocused.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/autofocus/autofocus.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7635f3e/src/autofocus/autofocus.js#L39" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFocused</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/autofocus/autofocus.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7898b32/src/autofocus/autofocus.js#L39" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFocused</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.card.directive.pfAggregateStatusCard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/aggregate-status/aggregate-status-card.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7635f3e/src/card/aggregate-status/aggregate-status-card.directive.js#L132" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfAggregateStatusCard</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/aggregate-status/aggregate-status-card.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7898b32/src/card/aggregate-status/aggregate-status-card.directive.js#L132" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfAggregateStatusCard</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
33
</span>
44
</div>

0 commit comments

Comments
 (0)