Merge pull request #3180 from awesomerobot/master

fixing missing border on dropdown
2015-02-08 10:24:08 -08:00 · 2015-02-08 10:24:08 -08:00 · 2f8e29bd04
parent 32b40503d0 29490209e7
commit 2f8e29bd04
2 changed files with 10 additions and 1 deletions
--- a/app/assets/stylesheets/common/base/combobox.scss
+++ b/app/assets/stylesheets/common/base/combobox.scss
@ -29,8 +29,17 @@

 .select2-container {
  border-radius: 3px;
+  border: 1px solid scale-color-diff();
+  &.select2-dropdown-open {
+    border: 0;
+  }
+  &.select2-container-active {
+    border-color: $tertiary;
+  }
 }

+
+
 .select2-container a.select2-choice {
  background: $secondary;
  border-radius: 3px;
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@ -218,7 +218,7 @@
      display: inline-block;
      .select2-container {
        width: 400px;
-        margin-top: 6px;
+        margin-top: 5px;
        a {
          padding-top: 4px;
          height: 28px;