Skip to content

Commit 8bae267

Browse files
sg00dwinf0x11
authored andcommitted
Update table label filter to reuse data-toolbar data-toolbar-filter and extend on top of table
Fixes openshift#1824
1 parent 11b5a75 commit 8bae267

File tree

5 files changed

+26
-15
lines changed

5 files changed

+26
-15
lines changed

app/styles/_tables.less

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,12 @@
147147
border-top: none;
148148
}
149149

150-
.table-filter-wrapper {
150+
.table-filter-extension {
151151
background-color: #f9f9f9;
152152
border-left: 1px solid @table-border-color;
153153
border-right: 1px solid @table-border-color;
154154
border-top: 1px solid @table-border-color;
155-
display: flex;
156-
padding: 10px 10px 5px 10px;
157-
.form-group {
158-
margin-bottom: 5px;
159-
}
155+
padding: 5px 10px;
160156
}
161157

162158
@media (max-width: @screen-xs-max) {

app/views/browse/build-config.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,12 @@ <h2 translate>No builds.</h2>
175175
<build-trends-chart builds="builds"></build-trends-chart>
176176
</div>
177177
<div ng-if="loaded && (unfilteredBuilds | hashSize) > 0" class="mar-bottom-xl">
178-
<div class="table-filter-wrapper">
179-
<project-filter></project-filter>
178+
<div class="table-filter-extension">
179+
<div class="data-toolbar">
180+
<div class="data-toolbar-filter">
181+
<project-filter></project-filter>
182+
</div>
183+
</div>
180184
</div>
181185
<table ng-if="!(buildConfig | isJenkinsPipelineStrategy)" class="table table-bordered table-hover table-mobile">
182186
<thead>

app/views/browse/deployment-config.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,12 @@ <h1 class="contains-actions">
127127
<translate>created</translate> <span am-time-ago="mostRecent.metadata.creationTimestamp"></span>
128128
</div>
129129
</div>
130-
<div class="table-filter-wrapper">
131-
<project-filter></project-filter>
130+
<div class="table-filter-extension">
131+
<div class="data-toolbar">
132+
<div class="data-toolbar-filter">
133+
<project-filter></project-filter>
134+
</div>
135+
</div>
132136
</div>
133137
<table class="table table-bordered table-hover table-mobile">
134138
<thead>

dist/scripts/templates.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,9 +1768,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
17681768
"<build-trends-chart builds=\"builds\"></build-trends-chart>\n" +
17691769
"</div>\n" +
17701770
"<div ng-if=\"loaded && (unfilteredBuilds | hashSize) > 0\" class=\"mar-bottom-xl\">\n" +
1771-
"<div class=\"table-filter-wrapper\">\n" +
1771+
"<div class=\"table-filter-extension\">\n" +
1772+
"<div class=\"data-toolbar\">\n" +
1773+
"<div class=\"data-toolbar-filter\">\n" +
17721774
"<project-filter></project-filter>\n" +
17731775
"</div>\n" +
1776+
"</div>\n" +
1777+
"</div>\n" +
17741778
"<table ng-if=\"!(buildConfig | isJenkinsPipelineStrategy)\" class=\"table table-bordered table-hover table-mobile\">\n" +
17751779
"<thead>\n" +
17761780
"<tr>\n" +
@@ -2418,9 +2422,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
24182422
"<translate>created</translate> <span am-time-ago=\"mostRecent.metadata.creationTimestamp\"></span>\n" +
24192423
"</div>\n" +
24202424
"</div>\n" +
2421-
"<div class=\"table-filter-wrapper\">\n" +
2425+
"<div class=\"table-filter-extension\">\n" +
2426+
"<div class=\"data-toolbar\">\n" +
2427+
"<div class=\"data-toolbar-filter\">\n" +
24222428
"<project-filter></project-filter>\n" +
24232429
"</div>\n" +
2430+
"</div>\n" +
2431+
"</div>\n" +
24242432
"<table class=\"table table-bordered table-hover table-mobile\">\n" +
24252433
"<thead>\n" +
24262434
"<tr>\n" +

dist/styles/main.css

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

0 commit comments

Comments
 (0)