Skip to content

Commit 8ed5c6d

Browse files
patternfly-buildpatternfly-build
committed
Merge branch 'master' into master-dist
2 parents f40e218 + b6e5ee6 commit 8ed5c6d

File tree

48 files changed

+337
-249
lines changed

Some content is hidden

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

48 files changed

+337
-249
lines changed

‎Gruntfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ module.exports = function (grunt) {
126126
image: 'misc/logo-alt.svg',
127127
scripts: ['lib/jquery/dist/jquery.js',
128128
'lib/bootstrap/dist/js/bootstrap.js',
129-
'lib/bootstrap-combobox/js/bootstrap-combobox.js',
129+
'lib/patternfly-bootstrap-combobox/js/bootstrap-combobox.js',
130130
'lib/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
131131
'lib/moment/moment.js',
132132
'lib/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',

‎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.14.0",
3+
"version": "3.15.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.14.0"
45+
"patternfly": "~3.15.0"
4646
},
4747
"devDependencies": {
4848
"angular-mocks": "1.3.0 - 1.5.*",

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

Lines changed: 146 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2897,14 +2897,19 @@ fieldset[disabled] .combobox-container .input-group-addon.active {
28972897
.dataTables_paginate .pagination-input .paginate_of b {
28982898
margin-left: 3px;
28992899
}
2900-
.dataTables_wrapper {
2901-
margin: 20px 0;
2900+
.dataTables_empty {
2901+
background: #f5f5f5;
29022902
}
2903-
@media (max-width: 767px) {
2904-
.dataTables_wrapper .table-responsive {
2905-
margin-bottom: 0;
2903+
/* Might need this for pagination?
2904+
.dataTables_wrapper {
2905+
margin: @line-height-computed 0;
2906+
@media (max-width: @screen-xs-max) {
2907+
.table-responsive {
2908+
margin-bottom: 0;
2909+
}
29062910
}
29072911
}
2912+
*/
29082913
.DTCR_clonedTable {
29092914
background-color: rgba(255, 255, 255, 0.7);
29102915
z-index: 202;
@@ -2914,53 +2919,6 @@ fieldset[disabled] .combobox-container .input-group-addon.active {
29142919
width: 1px;
29152920
z-index: 201;
29162921
}
2917-
table.datatable {
2918-
margin-bottom: 0;
2919-
max-width: none !important;
2920-
}
2921-
table.datatable thead .sorting,
2922-
table.datatable thead .sorting_asc,
2923-
table.datatable thead .sorting_desc,
2924-
table.datatable thead .sorting_asc_disabled,
2925-
table.datatable thead .sorting_desc_disabled {
2926-
cursor: pointer;
2927-
}
2928-
table.datatable thead .sorting_asc,
2929-
table.datatable thead .sorting_desc {
2930-
color: #0088ce !important;
2931-
position: relative;
2932-
}
2933-
table.datatable thead .sorting_asc:after,
2934-
table.datatable thead .sorting_desc:after {
2935-
content: "\f107";
2936-
font-family: "FontAwesome";
2937-
font-size: 10px;
2938-
font-weight: normal;
2939-
height: 9px;
2940-
left: 7px;
2941-
line-height: 12px;
2942-
position: relative;
2943-
top: 2px;
2944-
vertical-align: baseline;
2945-
width: 12px;
2946-
}
2947-
table.datatable thead .sorting_asc:before,
2948-
table.datatable thead .sorting_desc:before {
2949-
background: #0088ce;
2950-
content: "";
2951-
height: 2px;
2952-
position: absolute;
2953-
left: 0;
2954-
top: 0;
2955-
width: 100%;
2956-
}
2957-
table.datatable thead .sorting_asc:after {
2958-
content: "\f106";
2959-
top: -3px;
2960-
}
2961-
table.datatable th:active {
2962-
outline: none;
2963-
}
29642922
.footer-pf-alt,
29652923
.footer-pf {
29662924
background-color: #030303;
@@ -5272,6 +5230,139 @@ a.disabled {
52725230
.prettyprint ol.linenums {
52735231
margin-bottom: 0;
52745232
}
5233+
table.dataTable {
5234+
height: 100%;
5235+
margin-bottom: 0;
5236+
max-width: none !important;
5237+
}
5238+
table.dataTable tbody > tr > td.table-view-pf-actions {
5239+
padding: 0;
5240+
vertical-align: middle;
5241+
}
5242+
table.dataTable tbody > tr:hover > td.table-view-pf-actions {
5243+
background-color: #f5f5f5;
5244+
border-bottom-color: #d1d1d1;
5245+
}
5246+
table.dataTable tbody > tr.selected {
5247+
color: #fff;
5248+
background-color: #0088ce;
5249+
}
5250+
table.dataTable tbody > tr.selected > td {
5251+
border-bottom-color: #00659c;
5252+
}
5253+
table.dataTable tbody > tr.selected > td.table-view-pf-actions {
5254+
background-color: #f5f5f5;
5255+
border-bottom-color: #d1d1d1;
5256+
}
5257+
table.dataTable tbody > tr.selected:hover > td {
5258+
background-color: inherit;
5259+
border-bottom-color: #00659c;
5260+
}
5261+
table.dataTable tbody > tr.selected:hover > td.table-view-pf-actions {
5262+
background-color: #f5f5f5;
5263+
border-bottom-color: #d1d1d1;
5264+
}
5265+
table.dataTable thead .sorting,
5266+
table.dataTable thead .sorting_asc,
5267+
table.dataTable thead .sorting_desc,
5268+
table.dataTable thead .sorting_asc_disabled,
5269+
table.dataTable thead .sorting_desc_disabled {
5270+
cursor: pointer;
5271+
}
5272+
table.dataTable thead .sorting_asc,
5273+
table.dataTable thead .sorting_desc {
5274+
color: #0088ce !important;
5275+
position: relative;
5276+
}
5277+
table.dataTable thead .sorting_asc:after,
5278+
table.dataTable thead .sorting_desc:after {
5279+
content: "\f107";
5280+
font-family: "FontAwesome";
5281+
font-size: 10px;
5282+
font-weight: normal;
5283+
height: 9px;
5284+
left: 7px;
5285+
line-height: 12px;
5286+
position: relative;
5287+
top: 2px;
5288+
vertical-align: baseline;
5289+
width: 12px;
5290+
}
5291+
table.dataTable thead .sorting_asc:before,
5292+
table.dataTable thead .sorting_desc:before {
5293+
background: #0088ce;
5294+
content: "";
5295+
height: 2px;
5296+
position: absolute;
5297+
left: 0;
5298+
top: 0;
5299+
width: 100%;
5300+
}
5301+
table.dataTable thead .sorting_asc:after {
5302+
content: "\f106";
5303+
top: -3px;
5304+
}
5305+
table.dataTable th:active {
5306+
outline: none;
5307+
}
5308+
.table-view-pf-empty.blank-slate-pf {
5309+
background-color: #f5f5f5;
5310+
border: 1px solid #d1d1d1;
5311+
border-radius: 0;
5312+
margin-top: -1px;
5313+
}
5314+
.table-view-pf-toolbar.toolbar-pf {
5315+
background-color: #f5f5f5;
5316+
border-bottom: none;
5317+
border-left: 1px solid #d1d1d1;
5318+
border-right: 1px solid #d1d1d1;
5319+
border-top: 1px solid #d1d1d1;
5320+
box-shadow: none;
5321+
margin-left: 0px;
5322+
margin-right: 0px;
5323+
}
5324+
.table-view-pf-toolbar.toolbar-pf .toolbar-pf-results {
5325+
border-top: 1px solid #d1d1d1;
5326+
min-height: 40px;
5327+
line-height: 40px;
5328+
}
5329+
.table-view-pf-toolbar-external.toolbar-pf {
5330+
border-bottom: none;
5331+
border-top: none;
5332+
box-shadow: none;
5333+
}
5334+
.table-view-pf-toolbar-external.toolbar-pf .toolbar-pf-results {
5335+
border-top: 1px solid #d1d1d1;
5336+
min-height: 40px;
5337+
line-height: 40px;
5338+
}
5339+
.table-view-pf-actions {
5340+
background-color: #f1f1f1;
5341+
height: 100%;
5342+
}
5343+
.table-view-pf-actions .btn,
5344+
.table-view-pf-actions .dropdown-toggle {
5345+
border: none;
5346+
box-shadow: none;
5347+
height: 100%;
5348+
width: 100%;
5349+
}
5350+
.table-view-pf-actions .dropdown,
5351+
.table-view-pf-actions .table-view-pf-btn {
5352+
height: 100%;
5353+
}
5354+
.table-view-pf-actions .dropdown-menu.dropdown-menu-right {
5355+
right: -5px;
5356+
}
5357+
.table-view-pf-actions:last-child {
5358+
width: 24px;
5359+
}
5360+
.table-view-pf-select {
5361+
width: 33px;
5362+
}
5363+
.table-view-pf-select-results {
5364+
text-align: right;
5365+
}
52755366
.bootstrap-datetimepicker-widget a[data-action] {
52765367
border: 0;
52775368
box-shadow: none;
@@ -5945,11 +6036,11 @@ a.disabled {
59456036
}
59466037
.collapsed-secondary-nav-pf .secondary-nav-item-pf.active > a,
59476038
.collapsed-secondary-nav-pf .secondary-nav-item-pf:hover > a {
5948-
z-index: 1030;
6039+
z-index: 0;
59496040
}
59506041
.collapsed-tertiary-nav-pf .secondary-nav-item-pf.active > a,
59516042
.collapsed-tertiary-nav-pf .secondary-nav-item-pf:hover > a {
5952-
z-index: 1030;
6043+
z-index: 0;
59536044
}
59546045
.nav-pf-vertical-with-badges .secondary-nav-item-pf.active > a,
59556046
.nav-pf-vertical-with-badges .secondary-nav-item-pf:hover > a {
@@ -5996,7 +6087,7 @@ a.disabled {
59966087
.nav-pf-vertical.collapsed-tertiary-nav-pf .tertiary-nav-item-pf.active > a,
59976088
.nav-pf-vertical.collapsed-tertiary-nav-pf .secondary-nav-item-pf.hover > a,
59986089
.nav-pf-vertical.collapsed-tertiary-nav-pf .tertiary-nav-item-pf.hover > a {
5999-
z-index: 1030;
6090+
z-index: 0;
60006091
}
60016092
@media (min-width: 1200px) {
60026093
.nav-pf-vertical.nav-pf-persistent-secondary.secondary-visible-pf {

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

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -492,16 +492,7 @@
492492
'desktop': 1200
493493
};
494494

495-
if (typeof define === 'function' && define.amd) {
496-
define("patternfly", function () {
497-
return patternfly;
498-
});
499-
} else if ('undefined' !== typeof exports && 'undefined' !== typeof module) {
500-
module.exports = patternfly;
501-
} else {
502-
window.patternfly = patternfly;
503-
}
504-
495+
window.patternfly = patternfly;
505496
})(window);
506497

507498

@@ -1120,13 +1111,7 @@
11201111

11211112
forceResize = function (delay) {
11221113
setTimeout(function () {
1123-
if (window.dispatchEvent) {
1124-
window.dispatchEvent(new Event('resize'));
1125-
}
1126-
// Special case for IE
1127-
if ($(document).fireEvent) {
1128-
$(document).fireEvent('onresize');
1129-
}
1114+
$(window).trigger('resize');
11301115
}, delay);
11311116
},
11321117

‎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/edc2393/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/3be8811/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/edc2393/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/3be8811/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>

‎dist/docs/partials/api/patternfly.card.directive.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/edc2393/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/3be8811/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>

‎dist/docs/partials/api/patternfly.card.directive.pfCard - Trends.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-trend.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/edc2393/src/card/examples/card-trend.js#L146" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Trends</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-trend.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/3be8811/src/card/examples/card-trend.js#L146" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Trends</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.directive.pfCard - Utilization.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/basic/card.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/edc2393/src/card/basic/card.directive.js#L86" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Utilization</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/basic/card.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/3be8811/src/card/basic/card.directive.js#L86" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Utilization</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.charts.directive.pfC3Chart.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/charts/c3/c3-chart.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/edc2393/src/charts/c3/c3-chart.directive.js#L75" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfC3Chart</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/c3/c3-chart.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/3be8811/src/charts/c3/c3-chart.directive.js#L75" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfC3Chart</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
33
</span>
44
</div>

0 commit comments

Comments
 (0)