summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-02-10 17:39:07 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-02-10 17:39:07 +0000
commit487667e6a58976122f3bbbf0dfad2e210fccd38c (patch)
treead4a994bce164c3962b526139077eba967a5d2ba /app/assets
parented4b3a829a550e04ee76f894a3d7f4cfd209f683 (diff)
parent01c2a50fa2cfb09996bf5ce1cfe7cc319df68ee3 (diff)
downloadgitlab-ce-487667e6a58976122f3bbbf0dfad2e210fccd38c.tar.gz
Merge branch 'master' into 27932-merge-request-pipelines-displays-json
* master: rspec_profiling: Discover the correct branch name in GitLab CI Updated protected branches dropdown image in docs Fix admin_labels_spec.rb transient failure Make sure our current .gitlab-ci.yml is valid Show Pipeline(not Job) in MR desktop notification Make min width smaller for user settings
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/header.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 2a01bc4d44d..731ce57c245 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -272,7 +272,7 @@ header {
.header-user {
.dropdown-menu-nav {
- width: 140px;
+ min-width: 140px;
margin-top: -5px;
}
}