diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-23 03:54:53 +0300 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-06-23 14:47:30 +0300 |
| commit | acfad512963627a4190decda9f85426a454fc827 (patch) | |
| tree | 915505d688be13ca9dd23cfa0c56c828710a7b15 /app | |
| parent | fac4e8cccfe85169fbf3f5c9003de0ab0788c8a6 (diff) | |
Merge branch 'fix-dropdown-top-navbar-position-mobile' into 'master'
Fix dropdown position for the new button on mobile for the top navbar
Closes #34139
See merge request !12388
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index cba890ce831..4f54ca24940 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -395,6 +395,11 @@ .dropdown-menu-align-right { left: auto; right: 0; + margin-top: -5px; + + @media (max-width: $screen-xs-max) { + left: 0; + } } .dropdown-menu-selectable { diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index d8645afb7da..94986badaf9 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -346,6 +346,7 @@ header { width: auto; min-width: 140px; margin-top: -5px; + left: auto; .current-user { padding: 5px 18px; |