diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-23 00:54:53 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-23 00:54:53 +0000 |
| commit | a4ca7e8bebb4244ad4b2e9d4250390e291b50a29 (patch) | |
| tree | fd0d15856960e8f5785b62ac094db5b99123b458 | |
| parent | 65c2a5fe36eb47d803037a1e2b719be580635036 (diff) | |
| parent | c79540c6585f8676fd976e9ff5ef67374acfe6fc (diff) | |
| download | gitlab-ce-a4ca7e8bebb4244ad4b2e9d4250390e291b50a29.tar.gz | |
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
| -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; |