From 1eed46b4626f1f5d29d3c8c89ad66f0cbb42fd0d Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Tue, 9 May 2017 17:34:03 -0700
Subject: [PATCH] Clean up dropdown styles

---
 ui/src/sources/components/InfluxTable.js |  2 +-
 ui/src/style/components/dropdown.scss    | 18 +++++++++++++++---
 ui/src/style/unsorted.scss               | 23 -----------------------
 3 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/ui/src/sources/components/InfluxTable.js b/ui/src/sources/components/InfluxTable.js
index 9974d215e8..8f0d7bce66 100644
--- a/ui/src/sources/components/InfluxTable.js
+++ b/ui/src/sources/components/InfluxTable.js
@@ -34,7 +34,7 @@ const kapacitorDropdown = (
 
   return (
     <Dropdown
-      className="sources--kapacitor-selector"
+      className="dropdown-160"
       buttonColor="btn-info"
       buttonSize="btn-xs"
       items={kapacitorItems}
diff --git a/ui/src/style/components/dropdown.scss b/ui/src/style/components/dropdown.scss
index d366176c2d..06b5713d31 100644
--- a/ui/src/style/components/dropdown.scss
+++ b/ui/src/style/components/dropdown.scss
@@ -39,6 +39,8 @@ $dropdown-menu-max-height: 290px;
 .dropdown-toggle {
   position: relative;
   text-align: left;
+  display: flex;
+  align-items: center;
 
   .caret {
     position: absolute;
@@ -47,13 +49,23 @@ $dropdown-menu-max-height: 290px;
     transform: translateY(-50%);
   }
   > .icon {
-    font-size: 16px;
     display: inline-block;
     vertical-align: middle;
     margin-right: 6px;
-    position: relative;
-    top: -1px;
   }
+  .dropdown-selected {
+    display: inline-block;
+    flex: 1 0 0;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    padding-right: 15px;
+  }
+}
+.dropdown .dropdown-toggle.btn-xs {
+  height: 22px !important;
+  line-height: 22px !important;
+  padding: 0 9px !important;
 }
 
 /*
diff --git a/ui/src/style/unsorted.scss b/ui/src/style/unsorted.scss
index c8b9d7c29f..96274f0d46 100644
--- a/ui/src/style/unsorted.scss
+++ b/ui/src/style/unsorted.scss
@@ -155,29 +155,6 @@
 }
 
 
-/*
-    Kapacitor selector dropdown
-    ----------------------------------------------
-*/
-.dropdown .dropdown-toggle.btn-xs {
-  height: 22px !important;
-  line-height: 22px !important;
-  padding: 0 9px !important;
-}
-.dropdown-selected {
-  display: inline-block;
-  width: 100%;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding-right: 15px;
-}
-.dropdown.sources--kapacitor-selector {
-  .dropdown-toggle {
-    width: 160px;
-  }
-}
-
 /*
     Custom Tabs
     ----------------------------------------------