Skip to content

Commit 43dfda1

Browse files
committed
Use table toolbar styles for events filter
1 parent bc20227 commit 43dfda1

File tree

4 files changed

+36
-28
lines changed

4 files changed

+36
-28
lines changed

Diff for: app/styles/_tables.less

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
}
3030

3131
.events .data-toolbar {
32+
.form-group {
33+
margin-bottom: 0;
34+
}
3235
.search-pf {
3336
margin-bottom: 10px;
3437
width: 100%;

Diff for: app/views/directives/events.html

+29-27
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,39 @@
22
Loading...
33
</div>
44
<div ng-if="events" class="events">
5-
<div class="data-toolbar">
6-
<form role="form" class="search-pf has-button">
7-
<div class="form-group filter-controls has-clear">
8-
<div class="search-pf-input-group">
9-
<label for="events-filter" class="sr-only">Filter</label>
10-
<input type="search"
11-
placeholder="Filter by keyword"
12-
class="form-control"
13-
id="events-filter"
14-
ng-model="filter.text"
15-
autocorrect="off"
16-
autocapitalize="off"
17-
spellcheck="false">
18-
<button
19-
type="button"
20-
class="clear"
21-
aria-hidden="true"
22-
ng-if="filter.text"
23-
ng-click="filter.text = ''">
24-
<span class="pficon pficon-close"></span>
25-
</button>
5+
<div class="table-filter-extension">
6+
<div class="data-toolbar">
7+
<form role="form" class="search-pf has-button">
8+
<div class="form-group filter-controls has-clear">
9+
<div class="search-pf-input-group">
10+
<label for="events-filter" class="sr-only">Filter</label>
11+
<input type="search"
12+
placeholder="Filter by keyword"
13+
class="form-control"
14+
id="events-filter"
15+
ng-model="filter.text"
16+
autocorrect="off"
17+
autocapitalize="off"
18+
spellcheck="false">
19+
<button
20+
type="button"
21+
class="clear"
22+
aria-hidden="true"
23+
ng-if="filter.text"
24+
ng-click="filter.text = ''">
25+
<span class="pficon pficon-close"></span>
26+
</button>
27+
</div>
2628
</div>
29+
</form>
30+
<div class="vertical-divider"></div>
31+
<div class="sort-group">
32+
<span class="sort-label">Sort by</span>
33+
<div pf-sort config="sortConfig" class="sort-controls"></div>
2734
</div>
28-
</form>
29-
<div class="vertical-divider"></div>
30-
<div class="sort-group">
31-
<span class="sort-label">Sort by</span>
32-
<div pf-sort config="sortConfig" class="sort-controls"></div>
3335
</div>
3436
</div>
35-
<table class="table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table" ng-class="{ 'table-empty': (filteredEvents | hashSize) === 0 }">
37+
<table class="table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table">
3638
<thead>
3739
<tr>
3840
<th id="time">Time</th>

Diff for: dist/scripts/templates.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -6867,6 +6867,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
68676867
"Loading...\n" +
68686868
"</div>\n" +
68696869
"<div ng-if=\"events\" class=\"events\">\n" +
6870+
"<div class=\"table-filter-extension\">\n" +
68706871
"<div class=\"data-toolbar\">\n" +
68716872
"<form role=\"form\" class=\"search-pf has-button\">\n" +
68726873
"<div class=\"form-group filter-controls has-clear\">\n" +
@@ -6885,7 +6886,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
68856886
"<div pf-sort config=\"sortConfig\" class=\"sort-controls\"></div>\n" +
68866887
"</div>\n" +
68876888
"</div>\n" +
6888-
"<table class=\"table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table\" ng-class=\"{ 'table-empty': (filteredEvents | hashSize) === 0 }\">\n" +
6889+
"</div>\n" +
6890+
"<table class=\"table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table\">\n" +
68896891
"<thead>\n" +
68906892
"<tr>\n" +
68916893
"<th id=\"time\">Time</th>\n" +

Diff for: dist/styles/main.css

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

0 commit comments

Comments
 (0)