From eca671b972aedee2b9e01cc083ba1b08cb9b1a4b Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 1 Oct 2018 11:53:18 -0400
Subject: [PATCH] Prevent category dropdowns from cropping text, simplify
 styles

---
 app/assets/stylesheets/common/base/_topic-list.scss  |  2 +-
 app/assets/stylesheets/common/base/tagging.scss      | 12 ------------
 app/assets/stylesheets/common/components/badges.scss |  1 +
 .../stylesheets/common/select-kit/category-drop.scss |  7 ++++---
 .../stylesheets/common/select-kit/combo-box.scss     |  2 +-
 .../stylesheets/common/select-kit/select-kit.scss    |  1 -
 6 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 6fe89995f7..9e0d567afe 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -18,9 +18,9 @@
     background: $secondary;
     color: $primary;
     border: 1px solid $primary-medium;
-    padding: 5px 6px 5px 10px;
     font-size: $font-0;
     transition: none;
+    height: 10px // IE11 needs any height here for vertical centering, overriden elsewhere by min-height
   }
   .select-kit {
     align-self: center;
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 91a3608448..5c82fdbd59 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -62,18 +62,6 @@
 
   .badge-wrapper {
     margin-top: 0;
-
-    &.bullet .badge-category {
-    }
-
-    &.box,
-    &.bullet {
-    }
-
-    &.box + .topic-header-extra,
-    &.bullet + .topic-header-extra,
-    &.bar + .topic-header-extra {
-    }
   }
 }
 
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index a8a9d6517b..e9b2114fa5 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -31,6 +31,7 @@
       overflow: hidden;
     }
     .d-icon {
+      padding-left: 1px; // prevents lock icon from being cut off on the left
       margin-right: 3px;
     }
   }
diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index d61dccfa96..56bfdaff58 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -15,15 +15,16 @@
       }
 
       &.bar.has-selection .category-drop-header {
-        padding: 4px 5px 4px 10px;
+        padding: 0 5px 0 10px;
       }
 
       &.box.has-selection .category-drop-header {
-        padding: 3px 5px 3px 10px;
+        .badge-wrapper.box {
+          padding: 0;
+        }
       }
 
       .category-drop-header {
-        padding: 5px 5px 5px 10px;
 
         &.is-none .selected-name {
           color: inherit;
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index d30e8724b8..70dad5958c 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -41,7 +41,7 @@
     .select-kit-header {
       background: $secondary;
       border: 1px solid $primary-medium;
-      padding: $input-padding;
+      padding: 0 5px 0 10px;
       font-weight: 500;
       font-size: $font-0;
 
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index ccf97fa606..5549df98c4 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -67,7 +67,6 @@
     justify-content: space-between;
     flex-direction: row;
     min-height: 30px;
-    line-height: $line-height-small;
 
     .selected-name {
       text-align: left;