summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-03-29 01:45:15 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-03-29 01:45:15 +0000
commit828ad5f68f9888afafd8c28b89265dec5373fe90 (patch)
tree7ed0187fa30e6664a716bb6aad844a2a4a4ab8ea
parentf734f49520c075fcbdc693926659ebf899d57ad3 (diff)
parent7b8a4dd35199f4e9d2e631da92255a44cde7af28 (diff)
downloadgitlab-ce-828ad5f68f9888afafd8c28b89265dec5373fe90.tar.gz
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
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 11e1e4275ac..6c870ed927e 100644
--- 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;
+ }
}
}