Skip to content

Commit 94c1cf5

Browse files
committed
Use table toolar styles for events filter
1 parent d4e91d8 commit 94c1cf5

File tree

4 files changed

+23
-11
lines changed

4 files changed

+23
-11
lines changed

Diff for: app/styles/_tables.less

+14-5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
}
3030

3131
.events .data-toolbar {
32+
padding: 10px 10px 0;
3233
.search-pf {
3334
margin-bottom: 10px;
3435
width: 100%;
@@ -39,8 +40,12 @@
3940
}
4041
.sort-controls {
4142
display: inline-block;
43+
margin-bottom: 10px;
4244
}
4345
@media (min-width: @screen-sm-min) {
46+
.filter-controls {
47+
margin-bottom: 0;
48+
}
4449
.filter-controls, .sort-group {
4550
// Inline controls at wider widths.
4651
display: inline-block;
@@ -148,17 +153,21 @@
148153
}
149154

150155
.table-filter-wrapper {
151-
background-color: #f9f9f9;
152-
border-left: 1px solid @table-border-color;
153-
border-right: 1px solid @table-border-color;
154-
border-top: 1px solid @table-border-color;
155156
display: flex;
156-
padding: 10px 10px 5px 10px;
157+
padding: 10px 10px 5px;
157158
.form-group {
158159
margin-bottom: 5px;
159160
}
160161
}
161162

163+
.table-filter-wrapper,
164+
.events .data-toolbar {
165+
background-color: #f9f9f9;
166+
border-left: 1px solid @table-border-color;
167+
border-right: 1px solid @table-border-color;
168+
border-top: 1px solid @table-border-color;
169+
}
170+
162171
@media (max-width: @screen-xs-max) {
163172
.table-mobile {
164173
border-top-width: 0;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<div pf-sort config="sortConfig" class="sort-controls"></div>
3333
</div>
3434
</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 }">
35+
<table class="table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table">
3636
<thead>
3737
<tr>
3838
<th id="time">Time</th>

Diff for: dist/scripts/templates.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6822,7 +6822,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
68226822
"<div pf-sort config=\"sortConfig\" class=\"sort-controls\"></div>\n" +
68236823
"</div>\n" +
68246824
"</div>\n" +
6825-
"<table class=\"table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table\" ng-class=\"{ 'table-empty': (filteredEvents | hashSize) === 0 }\">\n" +
6825+
"<table class=\"table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table\">\n" +
68266826
"<thead>\n" +
68276827
"<tr>\n" +
68286828
"<th id=\"time\">Time</th>\n" +

Diff for: dist/styles/main.css

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

0 commit comments

Comments
 (0)