From 0542761de4c3b229d2e04ecfd41160438fa55d50 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 28 May 2014 12:12:31 -0400
Subject: [PATCH] Minor CSS fixes for Select2

---
 .../discourse/templates/user/preferences.js.handlebars         | 2 +-
 app/assets/stylesheets/common/base/combobox.scss               | 2 +-
 app/assets/stylesheets/desktop/discourse.scss                  | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
index b0bdd0825f7..965111b3bbc 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
@@ -145,7 +145,7 @@
       <label class="control-label">{{i18n user.email_settings}}</label>
       {{preference-checkbox labelKey="user.email_digests.title" checked=email_digests}}
       {{#if email_digests}}
-        <div class='controls control-dropdown'>
+        <div class='controls controls-dropdown'>
           {{combobox valueAttribute="value" content=digestFrequencies value=digest_after_days}}
         </div>
       {{/if}}
diff --git a/app/assets/stylesheets/common/base/combobox.scss b/app/assets/stylesheets/common/base/combobox.scss
index a2ea3163914..3bdf9b82837 100644
--- a/app/assets/stylesheets/common/base/combobox.scss
+++ b/app/assets/stylesheets/common/base/combobox.scss
@@ -1,4 +1,4 @@
-.category-combobox {
+.category-combobox, .select2-drop {
   .badge-category {
     display: inline-block;
   }
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 24db9bfb75d..d1e3c451c08 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -321,6 +321,9 @@ body {
       background-color: transparent;
     }
   }
+  .controls-dropdown {
+    margin-bottom: 10px;
+  }
   .control-group {
     margin-bottom: 9px;
     &.warning {