Merge branch 'fix-dropdown-item-height' into 'master'

Fix dropdown line height **Before** ![Screen_Shot_2016-03-28_at_5.54.37_PM](/uploads/67681da80b9104924083f13af3833553/Screen_Shot_2016-03-28_at_5.54.37_PM.png) **After** ![Screen_Shot_2016-03-28_at_5.57.37_PM](/uploads/5df14c2d131cc88dbc75b87959f56c3c/Screen_Shot_2016-03-28_at_5.57.37_PM.png) See merge request !3431

Merge branch 'fix-dropdown-item-height' into 'master'
828ad5f6 · Jacob Schatz · f734f495 · 7b8a4dd3 · 828ad5f6
Commit 828ad5f6 authored Mar 29, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

dropdowns.scss app/assets/stylesheets/framework/dropdowns.scss +5 -1

No files found.
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -117,7 +117,7 @@
    padding-left: 10px;
    padding-right: 10px;
    color: $dropdown-link-color;
-    line-height: 16px;
+    line-height: 34px;
    text-overflow: ellipsis;
    border-radius: 2px;
    white-space: nowrap;
@@ -136,6 +136,10 @@
        background-color: $dropdown-empty-row-bg;
      }
    }
+
+    &.dropdown-menu-user-link {
+      line-height: 16px;
+    }
  }
 }