From 376a763cc09ea084bf8542a879e1e7a39d5cfb28 Mon Sep 17 00:00:00 2001
From: kialam <digitalanime@gmail.com>
Date: Fri, 25 May 2018 10:34:03 -0400
Subject: [PATCH] vertically center `CLEAR ALL` "button" using newly created
 mixin and resolve merge conflict

---
 awx/ui/client/features/output/_index.less         | 4 ++++
 awx/ui/client/features/output/search.partial.html | 6 +++---
 awx/ui/client/lib/components/tag/_index.less      | 4 +---
 awx/ui/client/lib/theme/_mixins.less              | 6 ++++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/awx/ui/client/features/output/_index.less b/awx/ui/client/features/output/_index.less
index cb8e2940fd..a41721dd37 100644
--- a/awx/ui/client/features/output/_index.less
+++ b/awx/ui/client/features/output/_index.less
@@ -178,6 +178,10 @@
     padding: 6px @at-padding-input 6px @at-padding-input;
 }
 
+.jobz-searchClearAllContainer {
+    .at-mixin-VerticallyCenter();
+}
+
 .jobz-searchClearAll {
     font-size: 10px;
     padding-bottom: @at-space;
diff --git a/awx/ui/client/features/output/search.partial.html b/awx/ui/client/features/output/search.partial.html
index 4ef70a4ffb..ff2a49e73a 100644
--- a/awx/ui/client/features/output/search.partial.html
+++ b/awx/ui/client/features/output/search.partial.html
@@ -40,9 +40,9 @@
     <div class="TagComponentWrapper" ng-repeat="tag in vm.tags track by $index">
         <at-tag tag="tag" remove-tag="vm.removeSearchTag($index)"></at-tag>
     </div>
-    <div><a href class="jobz-searchClearAll" ng-click="vm.clearSearch()" ng-show="!(vm.tags | isEmpty)">
-        {{:: vm.strings.get('search.CLEAR_ALL') }}
-    </a></div>
+    <div class="jobz-searchClearAllContainer">
+        <a href class="jobz-searchClearAll" ng-click="vm.clearSearch()" ng-show="!(vm.tags | isEmpty)">{{:: vm.strings.get('search.CLEAR_ALL') }}</a>
+    </div>
 </div>
 
 <div class="jobz-searchKeyPaneContainer" ng-show="vm.key">
diff --git a/awx/ui/client/lib/components/tag/_index.less b/awx/ui/client/lib/components/tag/_index.less
index 98381154d8..1fa4f5ace5 100644
--- a/awx/ui/client/lib/components/tag/_index.less
+++ b/awx/ui/client/lib/components/tag/_index.less
@@ -41,9 +41,7 @@
 
 .TagComponent-button {
     padding: 0 @at-space;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
+    .at-mixin-VerticallyCenter();
 }
 
 .TagComponent-button:hover {
diff --git a/awx/ui/client/lib/theme/_mixins.less b/awx/ui/client/lib/theme/_mixins.less
index 701613a2ec..a3aa4ef1df 100644
--- a/awx/ui/client/lib/theme/_mixins.less
+++ b/awx/ui/client/lib/theme/_mixins.less
@@ -102,4 +102,10 @@
 
 .at-mixin-FontFixedWidth () {
     font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+}
+
+.at-mixin-VerticallyCenter () {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
 }
\ No newline at end of file