From 425a623599cdba161075469fa5c020c111d60415 Mon Sep 17 00:00:00 2001
From: Samuel Padgett <spadgett@redhat.com>
Date: Tue, 11 Jul 2017 13:57:13 -0400
Subject: [PATCH] Use table toolbar styles for events filter

---
 app/styles/_tables.less          |  3 ++
 app/views/directives/events.html | 56 +++++++++++++++++---------------
 dist/scripts/templates.js        |  4 ++-
 dist/styles/main.css             |  1 +
 4 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/app/styles/_tables.less b/app/styles/_tables.less
index 95d9443c1d..71811aabea 100644
--- a/app/styles/_tables.less
+++ b/app/styles/_tables.less
@@ -29,6 +29,9 @@
 }
 
 .events .data-toolbar {
+  .form-group {
+    margin-bottom: 0;
+  }
   .search-pf {
     margin-bottom: 10px;
     width: 100%;
diff --git a/app/views/directives/events.html b/app/views/directives/events.html
index 812bda149e..2ee31718c3 100644
--- a/app/views/directives/events.html
+++ b/app/views/directives/events.html
@@ -2,37 +2,39 @@
   Loading...
 </div>
 <div ng-if="events" class="events">
-  <div class="data-toolbar">
-    <form role="form" class="search-pf has-button">
-      <div class="form-group filter-controls has-clear">
-        <div class="search-pf-input-group">
-          <label for="events-filter" class="sr-only">Filter</label>
-          <input type="search"
-                 placeholder="Filter by keyword"
-                 class="form-control"
-                 id="events-filter"
-                 ng-model="filter.text"
-                 autocorrect="off"
-                 autocapitalize="none"
-                 spellcheck="false">
-          <button
-              type="button"
-              class="clear"
-              aria-hidden="true"
-              ng-if="filter.text"
-              ng-click="filter.text = ''">
-              <span class="pficon pficon-close"></span>
-          </button>
+  <div class="table-filter-extension">
+    <div class="data-toolbar">
+      <form role="form" class="search-pf has-button">
+        <div class="form-group filter-controls has-clear">
+          <div class="search-pf-input-group">
+            <label for="events-filter" class="sr-only">Filter</label>
+            <input type="search"
+                   placeholder="Filter by keyword"
+                   class="form-control"
+                   id="events-filter"
+                   ng-model="filter.text"
+                   autocorrect="off"
+                   autocapitalize="none"
+                   spellcheck="false">
+            <button
+                type="button"
+                class="clear"
+                aria-hidden="true"
+                ng-if="filter.text"
+                ng-click="filter.text = ''">
+                <span class="pficon pficon-close"></span>
+            </button>
+          </div>
         </div>
+      </form>
+      <div class="vertical-divider"></div>
+      <div class="sort-group">
+        <span class="sort-label">Sort by</span>
+        <pf-sort config="sortConfig" class="sort-controls"></pf-sort>
       </div>
-    </form>
-    <div class="vertical-divider"></div>
-    <div class="sort-group">
-      <span class="sort-label">Sort by</span>
-      <pf-sort config="sortConfig" class="sort-controls"></pf-sort>
     </div>
   </div>
-  <table class="table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table" ng-class="{ 'table-empty': (filteredEvents | hashSize) === 0 }">
+  <table class="table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table">
     <thead>
       <tr>
         <th id="time">Time</th>
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index dd3cc17d1f..ebddfea76f 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -6858,6 +6858,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "Loading...\n" +
     "</div>\n" +
     "<div ng-if=\"events\" class=\"events\">\n" +
+    "<div class=\"table-filter-extension\">\n" +
     "<div class=\"data-toolbar\">\n" +
     "<form role=\"form\" class=\"search-pf has-button\">\n" +
     "<div class=\"form-group filter-controls has-clear\">\n" +
@@ -6876,7 +6877,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<pf-sort config=\"sortConfig\" class=\"sort-controls\"></pf-sort>\n" +
     "</div>\n" +
     "</div>\n" +
-    "<table class=\"table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table\" ng-class=\"{ 'table-empty': (filteredEvents | hashSize) === 0 }\">\n" +
+    "</div>\n" +
+    "<table class=\"table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table\">\n" +
     "<thead>\n" +
     "<tr>\n" +
     "<th id=\"time\">Time</th>\n" +
diff --git a/dist/styles/main.css b/dist/styles/main.css
index 93a2d138c8..86a251c9a6 100644
--- a/dist/styles/main.css
+++ b/dist/styles/main.css
@@ -5422,6 +5422,7 @@ body,html{margin:0;padding:0}
 .data-toolbar .vertical-divider,.table-toolbar .vertical-divider{display:none}
 @media (min-width:768px){.data-toolbar .vertical-divider,.table-toolbar .vertical-divider{border-left:1px solid #bbb;display:inline-block;height:27px;margin:0 7px;vertical-align:middle;width:1px}
 }
+.events .data-toolbar .form-group{margin-bottom:0}
 .events .data-toolbar .search-pf{margin-bottom:10px;width:100%}
 .events .data-toolbar .sort-label{margin-right:4px;vertical-align:-1px}
 .events .data-toolbar .sort-controls{display:inline-block}