diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-31 21:02:57 +0000 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-02-02 09:42:27 +0100 |
| commit | df1500b3bf0e79b394d60f135bf3fc812c019cc6 (patch) | |
| tree | c2409e6eb062f582d287a846180f2abbeefff992 | |
| parent | 1b53ed13bc05c676dadd750e990b023e91244372 (diff) | |
| download | gitlab-ce-df1500b3bf0e79b394d60f135bf3fc812c019cc6.tar.gz | |
Merge branch '19164-mobile-settings' into 'master'
19164 Add settings dropdown to mobile screens
Closes #19164
See merge request !8896
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 11 | ||||
| -rw-r--r-- | app/views/layouts/nav/_admin.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/19164-mobile-settings.yml | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 401c2d0f6ee..fd081c2d7e1 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -294,16 +294,18 @@ .container-fluid { position: relative; + + .nav-control { + @media (max-width: $screen-sm-max) { + margin-right: 75px; + } + } } .controls { float: right; padding: 7px 0 0; - @media (max-width: $screen-sm-max) { - display: none; - } - i { color: $layout-link-gray; } @@ -361,6 +363,7 @@ .fade-left { @include fade(right, $gray-light); left: -5px; + text-align: center; .fa { left: -7px; diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml index ac04f57e217..19a947af4ca 100644 --- a/app/views/layouts/nav/_admin.html.haml +++ b/app/views/layouts/nav/_admin.html.haml @@ -1,5 +1,5 @@ += render 'layouts/nav/admin_settings' .scrolling-tabs-container{ class: nav_control_class } - = render 'layouts/nav/admin_settings' .fade-left = icon('angle-left') .fade-right diff --git a/changelogs/unreleased/19164-mobile-settings.yml b/changelogs/unreleased/19164-mobile-settings.yml new file mode 100644 index 00000000000..c26a20f87e2 --- /dev/null +++ b/changelogs/unreleased/19164-mobile-settings.yml @@ -0,0 +1,4 @@ +--- +title: 19164 Add settings dropdown to mobile screens +merge_request: +author: |