Merge pull request #1836 from sg00dwin/table-label-filter-issue1824

Merged by openshift-bot

Author: OpenShift Bot

app/styles/_tables.less

@@ -147,16 +147,12 @@
   border-top: none;
 }
 
-.table-filter-wrapper {
+.table-filter-extension {
   background-color: #f9f9f9;
   border-left: 1px solid @table-border-color;
   border-right: 1px solid @table-border-color;
   border-top: 1px solid @table-border-color;
-  display: flex;
-  padding: 10px 10px 5px 10px;
-  .form-group {
-    margin-bottom: 5px;
-  }
+  padding: 5px 10px;
 }
 
 @media (max-width: @screen-xs-max) {

app/views/browse/build-config.html

@@ -175,8 +175,12 @@ <h2>No builds.</h2>
                       <build-trends-chart builds="builds"></build-trends-chart>
                     </div>
                     <div ng-if="loaded && (unfilteredBuilds | hashSize) > 0" class="mar-bottom-xl">
-                      <div class="table-filter-wrapper">
-                        <project-filter></project-filter>
+                      <div class="table-filter-extension">
+                        <div class="data-toolbar">
+                          <div class="data-toolbar-filter">
+                            <project-filter></project-filter>
+                          </div>
+                        </div>
                       </div>
                       <table ng-if="!(buildConfig | isJenkinsPipelineStrategy)" class="table table-bordered table-hover table-mobile">
                         <thead>

app/views/browse/deployment-config.html

@@ -127,8 +127,12 @@ <h1 class="contains-actions">
                         created <span am-time-ago="mostRecent.metadata.creationTimestamp"></span>
                       </div>
                     </div>
-                    <div class="table-filter-wrapper">
-                      <project-filter></project-filter>
+                    <div class="table-filter-extension">
+                      <div class="data-toolbar">
+                        <div class="data-toolbar-filter">
+                          <project-filter></project-filter>
+                        </div>
+                      </div>
                     </div>
                     <table class="table table-bordered table-hover table-mobile">
                       <thead>

dist/scripts/templates.js

@@ -1770,9 +1770,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<build-trends-chart builds=\"builds\"></build-trends-chart>\n" +
     "</div>\n" +
     "<div ng-if=\"loaded && (unfilteredBuilds | hashSize) > 0\" class=\"mar-bottom-xl\">\n" +
-    "<div class=\"table-filter-wrapper\">\n" +
+    "<div class=\"table-filter-extension\">\n" +
+    "<div class=\"data-toolbar\">\n" +
+    "<div class=\"data-toolbar-filter\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
     "<table ng-if=\"!(buildConfig | isJenkinsPipelineStrategy)\" class=\"table table-bordered table-hover table-mobile\">\n" +
     "<thead>\n" +
     "<tr>\n" +
@@ -2425,9 +2429,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "created <span am-time-ago=\"mostRecent.metadata.creationTimestamp\"></span>\n" +
     "</div>\n" +
     "</div>\n" +
-    "<div class=\"table-filter-wrapper\">\n" +
+    "<div class=\"table-filter-extension\">\n" +
+    "<div class=\"data-toolbar\">\n" +
+    "<div class=\"data-toolbar-filter\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
     "<table class=\"table table-bordered table-hover table-mobile\">\n" +
     "<thead>\n" +
     "<tr>\n" +