Merge branch '19164-mobile-settings' into 'master'

19164 Add settings dropdown to mobile screens

Closes #19164

See merge request !8896

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;

app/views/layouts/nav/_admin.html.haml

+= render 'layouts/nav/admin_settings'
 .scrolling-tabs-container{ class: nav_control_class }
-  = render 'layouts/nav/admin_settings'
   .fade-left
     = icon('angle-left')
   .fade-right

changelogs/unreleased/19164-mobile-settings.yml

+---
+title: 19164 Add settings dropdown to mobile screens
+merge_request:
+author: