summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-08 20:59:46 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-08 20:59:46 +0000
commitb4812e2e867d1b738fc93afb3c5e5d1fd57ccd1d (patch)
tree2789eeaa605ec1c557de8b487109d7db112f4080
parent2268c6c70e5000341339944a1e4142d95ec6e8dc (diff)
parent8cd17f748bb564d6aeaa4fa8339b2d5431a10697 (diff)
downloadgitlab-ce-b4812e2e867d1b738fc93afb3c5e5d1fd57ccd1d.tar.gz
Merge branch 'dropdown-link-lineheight' into 'master'
Fixed dropdown link line-height ## What does this MR do? Fixes line-height issue on dropdown menu links ## Why was this MR needed? The line-height of some dropdown links were taking the parent, most noticeable the commit header ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-08_at_12.26.13](/uploads/51d6bbb4d727da0e3f27d715d6556d4f/Screen_Shot_2016-06-08_at_12.26.13.png) After: ![Screen_Shot_2016-06-08_at_12.25.03](/uploads/2dcbfaa67982500eef42cfe4247cd54d/Screen_Shot_2016-06-08_at_12.25.03.png) See merge request !4531
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 1ce7c57ebcd..d4d579a083d 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -124,6 +124,7 @@
position: relative;
padding: 5px 10px;
color: $dropdown-link-color;
+ line-height: initial;
text-overflow: ellipsis;
border-radius: 2px;
white-space: nowrap;