Skip to content

Commit e1cc488

Browse files
patternfly-buildpatternfly-build
committed
Merge branch 'master-local' into master-dist
2 parents 804bd62 + c40c9d1 commit e1cc488

File tree

71 files changed

+497
-616
lines changed

Some content is hidden

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

71 files changed

+497
-616
lines changed

‎dist/angular-patternfly.js‎

Lines changed: 66 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -7422,24 +7422,24 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
74227422
<div class="col-md-12">
74237423
<div class="col-md-12 cfme-row-column">
74247424
<div class="row">
7425-
<div class="col-md-2"><b>ID</b></div>
7426-
<div class="col-md-2"><b>Keyword</b></div>
7427-
<div class="col-md-4"><b>Category One</b></div>
7428-
<div class="col-md-4"><b>Category Two</b></div>
7425+
<div class="col-xs-3 col-md-2"><b>ID</b></div>
7426+
<div class="col-xs-3 col-md-2"><b>Keyword</b></div>
7427+
<div class="col-xs-3 col-md-4"><b>Category One</b></div>
7428+
<div class="col-sx-3 col-md-4"><b>Category Two</b></div>
74297429
</div>
74307430
</div>
74317431
<div ng-repeat="item in items" class="col-md-12 cfme-row-column">
74327432
<div class="row">
7433-
<div class="col-md-2">
7433+
<div class="col-xs-3 col-md-2">
74347434
<span>{{item.id}}</span>
74357435
</div>
7436-
<div class="col-md-2">
7436+
<div class="col-xs-3 col-md-2">
74377437
<span>{{item.keyword}}</span>
74387438
</div>
7439-
<div class="col-md-4">
7439+
<div class="col-xs-3 col-md-4">
74407440
<span>{{item.categoryOne}}</span>
74417441
</div>
7442-
<div class="col-md-4">
7442+
<div class="col-xs-3 col-md-4">
74437443
<span>{{item.categoryTwo}}</span>
74447444
</div>
74457445
</div>
@@ -7760,57 +7760,67 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
77607760
* @example
77617761
<example module="patternfly.filters">
77627762
<file name="index.html">
7763-
<div ng-controller="ViewCtrl" class="row example-container">
7764-
<div class="col-md-12">
7765-
<pf-filter id="exampleFilter" config="filterConfig"></pf-filter>
7766-
</div>
7767-
<hr class="col-md-12">
7768-
</br></br>
7769-
<div class="col-sm-4">
7770-
<form role="form">
7771-
<div class="form-group">
7772-
<label class="checkbox-inline">
7773-
<input type="checkbox" ng-model="filterConfig.inlineResults">Inline results</input>
7774-
</label>
7775-
</div>
7776-
</form>
7777-
</div>
7778-
<div class="col-sm-4">
7779-
<form role="form">
7780-
<div class="form-group">
7781-
<label class="checkbox-inline">
7782-
<input type="checkbox" ng-model="filterConfig.showTotalCountResults">Show total count in results</input>
7783-
</label>
7784-
</div>
7785-
</form>
7786-
</div>
7787-
<hr class="col-md-12">
7788-
<div class="col-md-12">
7789-
<label class="events-label">Valid Items: </label>
7763+
<div ng-controller="ViewCtrl" class="example-container">
7764+
<div class="row">
7765+
<div class="col-sm-12">
7766+
<pf-filter id="exampleFilter" config="filterConfig"></pf-filter>
7767+
</div>
77907768
</div>
7791-
<div class="col-md-12">
7792-
<div ng-repeat="item in items" class="col-md-12 cfme-row-column">
7793-
<div class="row">
7794-
<div class="col-md-3">
7795-
<span>{{item.name}}</span>
7796-
</div>
7797-
<div class="col-md-7">
7798-
<span>{{item.address}}</span>
7799-
</div>
7800-
<div class="col-md-2">
7801-
<span>{{item.birthMonth}}</span>
7769+
<div class="row">
7770+
<div class="col-xs-12">
7771+
<hr>
7772+
</div>
7773+
<div class="col-xs-4">
7774+
<form role="form">
7775+
<div class="form-group">
7776+
<label class="checkbox-inline">
7777+
<input type="checkbox" ng-model="filterConfig.inlineResults">Inline results</input>
7778+
</label>
78027779
</div>
7803-
<div class="col-md-4">
7804-
<span>{{item.car}}</span>
7780+
</form>
7781+
</div>
7782+
<div class="col-xs-8">
7783+
<form role="form">
7784+
<div class="form-group">
7785+
<label class="checkbox-inline">
7786+
<input type="checkbox" ng-model="filterConfig.showTotalCountResults">Show total count in results</input>
7787+
</label>
78057788
</div>
7806-
</div>
7789+
</form>
78077790
</div>
78087791
</div>
7809-
<div class="col-md-12">
7810-
<label class="events-label">Current Filters: </label>
7792+
<div class="row">
7793+
<div class="col-xs-12">
7794+
<hr>
7795+
</div>
7796+
<div class="col-sm-12">
7797+
<label class="events-label">Valid Items: </label>
7798+
</div>
78117799
</div>
7812-
<div class="col-md-12">
7813-
<textarea rows="5" class="col-md-12">{{filtersText}}</textarea>
7800+
<div ng-repeat="item in items" class="row">
7801+
<div class="col-xs-6 col-sm-3">
7802+
<span>{{item.name}}</span>
7803+
</div>
7804+
<div class="col-xs-6 col-sm-4">
7805+
<span>{{item.address}}</span>
7806+
</div>
7807+
<div class="hidden-xs col-sm-2">
7808+
<span>{{item.birthMonth}}</span>
7809+
</div>
7810+
<div class="hidden-xs col-sm-3">
7811+
<span>{{item.car}}</span>
7812+
</div>
7813+
</div>
7814+
<div class="row">
7815+
<div class="col-xs-12">
7816+
<hr>
7817+
</div>
7818+
<div class="col-xs-12">
7819+
<label class="events-label">Current Filters: </label>
7820+
</div>
7821+
<div class="col-xs-12">
7822+
<textarea class="col-xs-12" rows="5">{{filtersText}}</textarea>
7823+
</div>
78147824
</div>
78157825
</div>
78167826
</file>
@@ -18626,12 +18636,12 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
1862618636
'use strict';
1862718637

1862818638
$templateCache.put('filters/filter-panel/filter-panel-results.html',
18629-
"<span class=filter-pf><span class=toolbar-pf-results><h5>{{$ctrl.config.resultsCount}} <span ng-if=$ctrl.config.appliedFilters.length>of {{$ctrl.config.totalCount}}</span> {{$ctrl.config.resultsLabel === undefined ? \"Results\" : $ctrl.config.resultsLabel}}</h5><p ng-if=$ctrl.config.appliedFilters.length>Active filters:</p><ul class=list-inline><li ng-repeat=\"filter in $ctrl.config.appliedFilters\"><span ng-if=\"filter.values.length === 1\" class=\"active-filter label label-info single-label\"><span class=pf-filter-label-category>{{filter.title}}:</span> {{filter.values[0]}} <a><span ng-click=\"$ctrl.clearFilter(filter, filter.values[0])\" class=\"pficon pficon-close\"></span></a></span> <span ng-if=\"filter.values.length > 1\" class=\"active-filter label pf-filter-label-category\">{{filter.title}}:<ul class=\"list-inline category-values\"><li ng-repeat=\"value in filter.values\"><span class=\"active-filter label label-info\">{{value}} <a><span ng-click=\"$ctrl.clearFilter(filter, value)\" class=\"pficon pficon-close\"></span></a></span></li></ul></span></li></ul><p><a class=clear-filters ng-click=$ctrl.clearAllFilters() ng-if=\"$ctrl.config.appliedFilters.length > 0\">Clear All Filters</a></p></span></span>"
18639+
"<div class=filter-pf><div class=toolbar-pf-results><h5>{{$ctrl.config.resultsCount}} <span ng-if=$ctrl.config.appliedFilters.length>of {{$ctrl.config.totalCount}}</span> {{$ctrl.config.resultsLabel === undefined ? \"Results\" : $ctrl.config.resultsLabel}}</h5><p class=filter-pf-active-label ng-if=$ctrl.config.appliedFilters.length>Active filters:</p><ul class=list-inline><li ng-repeat=\"filter in $ctrl.config.appliedFilters\" class=filter-pf-category-item><span class=\"label pf-filter-category-label\" ng-class=\"{'label-info': filter.values.length === 1, 'multiples': filter.values.length > 1}\">{{filter.title}}:<ul class=\"list-inline filter-pf-category-values\"><li ng-repeat=\"value in filter.values\"><span class=\"label label-info\">{{value}} <a href=javascript:void(0);><span ng-click=\"$ctrl.clearFilter(filter, value)\" class=\"pficon pficon-close\"></span></a></span></li></ul></span></li></ul><p><a href=javascript:void(0); ng-click=$ctrl.clearAllFilters() ng-if=\"$ctrl.config.appliedFilters.length > 0\">Clear All Filters</a></p></div></div>"
1863018640
);
1863118641

1863218642

1863318643
$templateCache.put('filters/filter-panel/filter-panel.html',
18634-
"<div class=filter-pf><span class=\"dropdown primary-action\" uib-dropdown><button class=\"btn btn-default dropdown-toggle\" uib-dropdown-toggle type=button>Filter <span class=caret></span></button><div ng-transclude class=dropdown-menu ng-click=$event.stopPropagation()></div></span><pf-filter-panel-results config=$ctrl.config></pf-filter-panel-results></div>"
18644+
"<div class=\"filter-pf inline-filter-pf\"><span class=\"dropdown primary-action\" uib-dropdown><button class=\"btn btn-default dropdown-toggle\" uib-dropdown-toggle type=button>Filter <span class=caret></span></button><div ng-transclude class=dropdown-menu ng-click=$event.stopPropagation()></div></span><pf-filter-panel-results config=$ctrl.config></pf-filter-panel-results></div>"
1863518645
);
1863618646

1863718647

@@ -18641,7 +18651,7 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
1864118651

1864218652

1864318653
$templateCache.put('filters/simple-filter/filter-results.html',
18644-
"<div class=filter-pf><div class=\"row toolbar-pf-results\"><div class=col-sm-12><span ng-if=\"$ctrl.config.showTotalCountResults !== true || $ctrl.config.totalCount === undefined || $ctrl.config.appliedFilters.length === 0\"><h5 ng-if=\"$ctrl.config.resultsCount === 1\">{{$ctrl.config.resultsCount}} {{$ctrl.config.itemsLabel}}</h5><h5 ng-if=\"$ctrl.config.resultsCount !== 1\">{{$ctrl.config.resultsCount}} {{$ctrl.config.itemsLabelPlural}}</h5></span> <span ng-if=\"$ctrl.config.showTotalCountResults === true && $ctrl.config.totalCount !== undefined && $ctrl.config.appliedFilters.length > 0\"><h5 ng-if=\"$ctrl.config.totalCount === 1\">{{$ctrl.config.resultsCount}} of {{$ctrl.config.totalCount}} {{$ctrl.config.itemsLabel}}</h5><h5 ng-if=\"$ctrl.config.totalCount !== 1\">{{$ctrl.config.resultsCount}} of {{$ctrl.config.totalCount}} {{$ctrl.config.itemsLabelPlural}}</h5></span><p ng-if=\"$ctrl.config.appliedFilters.length > 0\">Active Filters:</p><ul class=list-inline><li ng-repeat=\"filter in $ctrl.config.appliedFilters\"><span class=\"active-filter label label-info\">{{filter.title}}: {{((filter.value.filterCategory.title || filter.value.filterCategory) + filter.value.filterDelimiter + (filter.value.filterValue.title || filter.value.filterValue)) || filter.value.title || filter.value}} <a><span class=\"pficon pficon-close\" ng-click=$ctrl.clearFilter(filter)></span></a></span></li></ul><p><a class=clear-filters ng-click=$ctrl.clearAllFilters() ng-if=\"$ctrl.config.appliedFilters.length > 0\">Clear All Filters</a></p><div ng-if=\"$ctrl.config.selectedCount !== undefined && $ctrl.config.totalCount !== undefined\" class=pf-table-view-selected-label><strong>{{$ctrl.config.selectedCount}}</strong> of <strong>{{$ctrl.config.totalCount}}</strong> selected</div></div><!-- /col --></div><!-- /row --></div>"
18654+
"<div class=filter-pf><div class=toolbar-pf-results><span ng-if=\"$ctrl.config.showTotalCountResults !== true || $ctrl.config.totalCount === undefined || $ctrl.config.appliedFilters.length === 0\"><h5 ng-if=\"$ctrl.config.resultsCount === 1\">{{$ctrl.config.resultsCount}} {{$ctrl.config.itemsLabel}}</h5><h5 ng-if=\"$ctrl.config.resultsCount !== 1\">{{$ctrl.config.resultsCount}} {{$ctrl.config.itemsLabelPlural}}</h5></span> <span ng-if=\"$ctrl.config.showTotalCountResults === true && $ctrl.config.totalCount !== undefined && $ctrl.config.appliedFilters.length > 0\"><h5 ng-if=\"$ctrl.config.totalCount === 1\">{{$ctrl.config.resultsCount}} of {{$ctrl.config.totalCount}} {{$ctrl.config.itemsLabel}}</h5><h5 ng-if=\"$ctrl.config.totalCount !== 1\">{{$ctrl.config.resultsCount}} of {{$ctrl.config.totalCount}} {{$ctrl.config.itemsLabelPlural}}</h5></span><p class=filter-pf-active-label ng-if=\"$ctrl.config.appliedFilters.length > 0\">Active Filters:</p><ul class=list-inline><li ng-repeat=\"filter in $ctrl.config.appliedFilters\"><span class=\"active-filter label label-info\">{{filter.title}}: {{((filter.value.filterCategory.title || filter.value.filterCategory) + filter.value.filterDelimiter + (filter.value.filterValue.title || filter.value.filterValue)) || filter.value.title || filter.value}} <a href=javascript:void(0);><span class=\"pficon pficon-close\" ng-click=$ctrl.clearFilter(filter)></span></a></span></li></ul><p><a href=javascript:void(0); class=clear-filters ng-click=$ctrl.clearAllFilters() ng-if=\"$ctrl.config.appliedFilters.length > 0\">Clear All Filters</a></p><div ng-if=\"$ctrl.config.selectedCount !== undefined && $ctrl.config.totalCount !== undefined\" class=pf-table-view-selected-label><strong>{{$ctrl.config.selectedCount}}</strong> of <strong>{{$ctrl.config.totalCount}}</strong> selected</div></div></div>"
1864518655
);
1864618656

1864718657

‎dist/angular-patternfly.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 25 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -554,22 +554,13 @@ pf-topology {
554554
margin-left: -30px;
555555
margin-bottom: 10px;
556556
}
557-
.filter-pf a {
558-
cursor: pointer;
559-
}
560-
.filter-pf .input-group .input-group-btn .dropdown-menu > .selected > a {
561-
background-color: #0088ce !important;
562-
border-color: #0076b7 !important;
563-
color: #fff !important;
564-
}
565557
.filter-pf .category-select {
566558
display: flex;
567559
}
568560
.filter-pf .category-select-value {
569561
border-left-width: 0 !important;
570562
}
571563
.filter-pf.filter-fields .form-group {
572-
padding-left: 0;
573564
width: 275px;
574565
}
575566
.filter-select .btn-default {
@@ -600,6 +591,9 @@ pf-filter-panel input::-webkit-input-placeholder {
600591
font-style: italic;
601592
padding-left: 10px;
602593
}
594+
pf-filter-panel .inline-filter-pf > .dropdown {
595+
margin-right: 10px;
596+
}
603597
pf-filter-panel .filter-panel-container {
604598
padding: 10px;
605599
}
@@ -618,74 +612,43 @@ pf-filter-panel .filter-panel-container .category .category-option-label {
618612
font-size: 12px;
619613
vertical-align: text-bottom;
620614
}
621-
pf-filter-panel .list-inline > li {
622-
padding-right: 0;
623-
}
624-
pf-filter-panel .toolbar-pf-results {
625-
border-top: none;
626-
margin-left: 10px;
627-
vertical-align: middle;
615+
.filter-pf-active-label {
616+
margin-right: 5px;
628617
}
629-
pf-filter-panel .toolbar-pf-results .single-label {
630-
padding: 6px;
618+
.filter-pf-category-item {
619+
margin-bottom: 5px;
631620
}
632-
pf-filter-panel .toolbar-pf-results .single-label .pf-filter-label-category {
633-
background-color: #00659c;
621+
.pf-filter-category-label {
634622
font-weight: 700;
635-
padding-right: 2px;
636-
padding-left: 0;
637-
}
638-
pf-filter-panel .toolbar-pf-results .single-label .pficon-close {
639-
padding-right: 6px;
640-
}
641-
pf-filter-panel .toolbar-pf-results p {
642-
padding-right: 10px;
643-
padding-left: 10px;
623+
padding: 5px 0 6px 5px;
624+
margin-right: 5px;
644625
}
645-
.pf-filter-label-category {
626+
.pf-filter-category-label.multiples {
646627
background-color: #39a5dc;
647-
font-weight: 700;
648-
padding: 6px;
628+
padding-right: 5px;
649629
}
650-
.pf-filter-label-category .category-values {
651-
padding-left: 4px;
630+
.filter-pf-category-values.list-inline {
631+
margin-left: 0;
652632
}
653-
.filter-pf.inline-filter-pf {
654-
flex: 1 1 100%;
655-
margin: 15px 15px 7px 0;
633+
.filter-pf-category-values.list-inline > li {
634+
margin-left: 5px;
635+
padding: 0;
656636
}
657637
.filter-pf.inline-filter-pf pf-filter-fields,
658-
.filter-pf.inline-filter-pf pf-filter-results {
638+
.filter-pf.inline-filter-pf pf-filter-results,
639+
.filter-pf.inline-filter-pf pf-filter-panel-results {
659640
display: inline-block;
660641
}
661-
.filter-pf.inline-filter-pf .form-group {
662-
margin-bottom: 0;
642+
.filter-pf.inline-filter-pf pf-filter-fields {
643+
vertical-align: middle;
644+
}
645+
.filter-pf.inline-filter-pf .filter-fields > .form-group {
646+
margin-bottom: 3px;
663647
margin-right: 15px;
664648
}
665649
.filter-pf.inline-filter-pf .toolbar-pf-results {
666650
border-top: none;
667-
margin: 0;
668-
}
669-
.filter-pf.inline-filter-pf .toolbar-pf-results .col-sm-12 {
670-
float: left;
671-
padding: 0;
672-
}
673-
.filter-pf.inline-filter-pf .toolbar-pf-results h5,
674-
.filter-pf.inline-filter-pf .toolbar-pf-results p,
675-
.filter-pf.inline-filter-pf .toolbar-pf-results ul {
676-
line-height: 1.43;
677-
padding-bottom: 6px;
678-
padding-top: 6px;
679-
}
680-
.filter-pf.inline-filter-pf .toolbar-pf-results .list-inline {
681-
margin-bottom: -5px;
682-
padding-right: 5px;
683-
}
684-
.filter-pf.inline-filter-pf .toolbar-pf-results .list-inline > li {
685-
margin-bottom: 5px;
686-
}
687-
.filter-pf .toolbar-pf-results .list-inline {
688-
margin-left: 0;
651+
margin-top: 0;
689652
}
690653
.sort-pf .btn-link {
691654
color: #252525;

0 commit comments

Comments
 (0)