Skip to content

Commit 4c4c3b2

Browse files
patternfly-buildpatternfly-build
committed
Merge branch 'master-local' into master-dist
2 parents 246496f + 0da3ea4 commit 4c4c3b2

File tree

54 files changed

+110
-61
lines changed

Some content is hidden

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

54 files changed

+110
-61
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"datatables.net": "^1.10.12",
4848
"datatables.net-select": "~1.2.0",
4949
"lodash": "4.x",
50-
"patternfly": "3.25.0"
50+
"patternfly": "^3.25.1"
5151
},
5252
"devDependencies": {
5353
"angular-mocks": "1.5.*",

‎dist/docs/css/patternfly-additions.css‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1978,11 +1978,18 @@ select.selectpicker {
19781978
}
19791979
.applauncher-pf .applauncher-pf-link-icon {
19801980
font-size: 2em;
1981+
text-align: center;
1982+
width: 1.28571429em;
1983+
min-height: 1.28571429em;
1984+
}
1985+
@media (min-width: 768px) {
1986+
.applauncher-pf .applauncher-pf-link-icon {
1987+
padding-right: 4px;
1988+
}
19811989
}
19821990
.applauncher-pf .applauncher-pf-link-icon,
19831991
.applauncher-pf .applauncher-pf-link-title {
19841992
display: inline-block;
1985-
width: auto;
19861993
vertical-align: middle;
19871994
}
19881995
.applauncher-pf.applauncher-pf-block-list .applauncher-pf-item {
@@ -2001,6 +2008,7 @@ select.selectpicker {
20012008
.applauncher-pf.applauncher-pf-block-list .applauncher-pf-link-title {
20022009
display: block;
20032010
padding: 0;
2011+
width: auto;
20042012
}
20052013
.applauncher-pf.applauncher-pf-block-list .applauncher-pf-link-title {
20062014
white-space: normal;
@@ -2213,6 +2221,9 @@ select.selectpicker {
22132221
.navbar-pf .applauncher-pf .applauncher-pf-link-icon,
22142222
.navbar-pf-alt .applauncher-pf .applauncher-pf-link-icon {
22152223
font-size: 2em;
2224+
text-align: center;
2225+
width: 1.28571429em;
2226+
min-height: 1.28571429em;
22162227
}
22172228
.navbar-pf .navbar-utility .applauncher-pf .applauncher-pf-link-icon,
22182229
.navbar-pf-alt .navbar-utility .applauncher-pf .applauncher-pf-link-icon,
@@ -2223,7 +2234,6 @@ select.selectpicker {
22232234
.navbar-pf .applauncher-pf .applauncher-pf-link-title,
22242235
.navbar-pf-alt .applauncher-pf .applauncher-pf-link-title {
22252236
display: inline-block;
2226-
width: auto;
22272237
vertical-align: middle;
22282238
}
22292239
.navbar-pf .navbar-utility .applauncher-pf.applauncher-pf-block-list .applauncher-pf-item,
@@ -2246,6 +2256,7 @@ select.selectpicker {
22462256
.navbar-pf-alt .applauncher-pf.applauncher-pf-block-list .applauncher-pf-link-title {
22472257
display: block;
22482258
padding: 0;
2259+
width: auto;
22492260
}
22502261
.navbar-pf .navbar-utility .applauncher-pf.applauncher-pf-block-list .applauncher-pf-link-title,
22512262
.navbar-pf-alt .navbar-utility .applauncher-pf.applauncher-pf-block-list .applauncher-pf-link-title,
@@ -2255,6 +2266,14 @@ select.selectpicker {
22552266
word-wrap: break-word;
22562267
}
22572268
}
2269+
@media (min-width: 768px) and (min-width: 768px) {
2270+
.navbar-pf .navbar-utility .applauncher-pf .applauncher-pf-link-icon,
2271+
.navbar-pf-alt .navbar-utility .applauncher-pf .applauncher-pf-link-icon,
2272+
.navbar-pf .applauncher-pf .applauncher-pf-link-icon,
2273+
.navbar-pf-alt .applauncher-pf .applauncher-pf-link-icon {
2274+
padding-right: 4px;
2275+
}
2276+
}
22582277
@media (min-width: 768px) and (min-width: 768px) {
22592278
.navbar-pf .navbar-utility .applauncher-pf.applauncher-pf-block-list .applauncher-pf-link,
22602279
.navbar-pf-alt .navbar-utility .applauncher-pf.applauncher-pf-block-list .applauncher-pf-link,
@@ -5480,6 +5499,9 @@ a.disabled {
54805499
margin-right: 5px;
54815500
padding-right: 9px;
54825501
}
5502+
.drawer-pf-notification > .dropdown-kebab-pf {
5503+
margin-top: -3px;
5504+
}
54835505
.drawer-pf-notification .pficon {
54845506
font-size: 14px;
54855507
margin-top: 3px;
@@ -5521,6 +5543,14 @@ a.disabled {
55215543
margin: 0;
55225544
padding: 6px 15px;
55235545
}
5546+
.drawer-pf-notification.expanded-notification .drawer-pf-notification-content {
5547+
display: -ms-flexbox;
5548+
display: flex;
5549+
}
5550+
.drawer-pf-notification.expanded-notification .drawer-pf-notification-content .drawer-pf-notification-message {
5551+
-ms-flex: 1 1;
5552+
flex: 1 1;
5553+
}
55245554
/* Exclusive styles to work with Vertical Navigation */
55255555
.navbar-pf-vertical .drawer-pf {
55265556
height: calc(100vh - 80px);

‎dist/docs/css/patternfly.css‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10043,6 +10043,15 @@ fieldset[disabled] .pagination > li > span.active {
1004310043
.panel-group .panel-default .panel-heading + .panel-collapse .panel-body {
1004410044
border-top: 1px solid #d1d1d1;
1004510045
}
10046+
.panel-group .panel-info {
10047+
border-color: #00659c;
10048+
}
10049+
.panel-group .panel-info .panel-heading {
10050+
background-color: #dae5f4;
10051+
}
10052+
.panel-group .panel-info + .panel-default {
10053+
border-top-color: #00659c;
10054+
}
1004610055
.panel-group .panel-primary {
1004710056
border-color: #39a5dc;
1004810057
}
@@ -10052,6 +10061,9 @@ fieldset[disabled] .pagination > li > span.active {
1005210061
.panel-group .panel-primary + .panel-default {
1005310062
border-top-color: #39a5dc;
1005410063
}
10064+
.panel-group .panel-primary + .panel-info {
10065+
border-top-color: #39a5dc;
10066+
}
1005510067
.panel-group .panel-success {
1005610068
border-color: #3f9c35;
1005710069
}
@@ -10061,6 +10073,9 @@ fieldset[disabled] .pagination > li > span.active {
1006110073
.panel-group .panel-success + .panel-default {
1006210074
border-top-color: #3f9c35;
1006310075
}
10076+
.panel-group .panel-success + .panel-info {
10077+
border-top-color: #3f9c35;
10078+
}
1006410079
.panel-group .panel-success + .panel-primary {
1006510080
border-top-color: #3f9c35;
1006610081
}
@@ -10073,6 +10088,9 @@ fieldset[disabled] .pagination > li > span.active {
1007310088
.panel-group .panel-warning + .panel-default {
1007410089
border-top-color: #ec7a08;
1007510090
}
10091+
.panel-group .panel-warning + .panel-info {
10092+
border-top-color: #ec7a08;
10093+
}
1007610094
.panel-group .panel-warning + .panel-primary {
1007710095
border-top-color: #ec7a08;
1007810096
}
@@ -10088,6 +10106,9 @@ fieldset[disabled] .pagination > li > span.active {
1008810106
.panel-group .panel-danger + .panel-default {
1008910107
border-top-color: #cc0000;
1009010108
}
10109+
.panel-group .panel-danger + .panel-info {
10110+
border-top-color: #cc0000;
10111+
}
1009110112
.panel-group .panel-danger + .panel-primary {
1009210113
border-top-color: #cc0000;
1009310114
}

‎dist/docs/grunt-scripts/patternfly-settings-charts.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
},
199199
getDefaultPieTooltip = function () {
200200
return {
201-
contents: $().pfPieTooltipContents
201+
contents: patternfly.pfPieTooltipContents
202202
};
203203
},
204204
getDefaultPieLegend = function () {
@@ -316,7 +316,7 @@
316316
},
317317
getDefaultSingleLineTooltip = function () {
318318
return {
319-
contents: $().pfGetBarChartTooltipContentsFn()
319+
contents: patternfly.pfGetBarChartTooltipContentsFn()
320320
};
321321
},
322322
getDefaultSingleLineLegend = function () {
@@ -357,7 +357,7 @@
357357
},
358358
getDefaultSingleAreaTooltip = function () {
359359
return {
360-
contents: $().pfGetBarChartTooltipContentsFn()
360+
contents: patternfly.pfGetBarChartTooltipContentsFn()
361361
};
362362
},
363363
getDefaultSingleAreaLegend = function () {
@@ -421,4 +421,3 @@
421421
};
422422
};
423423
})(window);
424-

‎dist/docs/grunt-scripts/patternfly-settings.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'use strict';
33

44
var patternfly = {
5-
version: "3.25.0",
5+
version: "3.25.1",
66
};
77

88
// definition of breakpoint sizes for tablet and desktop modes
@@ -304,7 +304,7 @@
304304
},
305305
getDefaultPieTooltip = function () {
306306
return {
307-
contents: $().pfPieTooltipContents
307+
contents: patternfly.pfPieTooltipContents
308308
};
309309
},
310310
getDefaultPieLegend = function () {
@@ -422,7 +422,7 @@
422422
},
423423
getDefaultSingleLineTooltip = function () {
424424
return {
425-
contents: $().pfGetBarChartTooltipContentsFn()
425+
contents: patternfly.pfGetBarChartTooltipContentsFn()
426426
};
427427
},
428428
getDefaultSingleLineLegend = function () {
@@ -463,7 +463,7 @@
463463
},
464464
getDefaultSingleAreaTooltip = function () {
465465
return {
466-
contents: $().pfGetBarChartTooltipContentsFn()
466+
contents: patternfly.pfGetBarChartTooltipContentsFn()
467467
};
468468
},
469469
getDefaultSingleAreaLegend = function () {
@@ -527,4 +527,3 @@
527527
};
528528
};
529529
})(window);
530-

‎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/6acc99d/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/7e787d4/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.canvas.directive.pfCanvas.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/canvas-view/examples/canvas.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/6acc99d/src/canvas-view/examples/canvas.js#L329" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvas</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvas.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7e787d4/src/canvas-view/examples/canvas.js#L329" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvas</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.canvas</code>
33
</span>
44
</div>

‎dist/docs/partials/api/patternfly.canvas.directive.pfCanvasEditor.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/canvas-view/examples/canvasEditor.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/6acc99d/src/canvas-view/examples/canvasEditor.js#L344" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvasEditor</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvasEditor.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7e787d4/src/canvas-view/examples/canvasEditor.js#L344" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvasEditor</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.canvas</code>
33
</span>
44
</div>

‎dist/docs/partials/api/patternfly.card.component.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.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/6acc99d/src/card/aggregate-status/aggregate-status-card.component.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.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7e787d4/src/card/aggregate-status/aggregate-status-card.component.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>

‎dist/docs/partials/api/patternfly.card.component.pfCard - Timeframe Filters.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/examples/card-timeframe.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/6acc99d/src/card/examples/card-timeframe.js#L82" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Timeframe Filters</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-timeframe.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/7e787d4/src/card/examples/card-timeframe.js#L82" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Timeframe Filters</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)