summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-26 09:25:16 +0000
committerJarka Kadlecova <jarka@gitlab.com>2017-09-26 11:44:11 +0200
commit8854020545647abad48bebd5f630ed627c36a9cb (patch)
tree49fe576fa18c71e3dfbd81d4d5768c3757770d1f
parent7d537e59c42d4568bc8822ebb4d4108384d445df (diff)
downloadgitlab-ce-10-0-stable-patch-2.tar.gz
Merge branch 'winh-user-dropdown-nowrap' into 'master'10-0-stable-patch-2
Avoid wrapping users in dropdown Closes #38077 See merge request gitlab-org/gitlab-ce!14410
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 2bcd23a15e6..c0d8e6c328c 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -779,6 +779,14 @@
white-space: normal;
width: 100%;
+ &.dropdown-menu-user-link {
+ white-space: nowrap;
+
+ .dropdown-menu-user-username {
+ display: block;
+ }
+ }
+
// make sure the text color is not overriden
&.text-danger {
color: $brand-danger;