Simplify width for dropdown-menu on mobile

4 files changed, 8 insertions, 13 deletions

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index fbf49f3a813..5e410cbf563 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -205,6 +205,7 @@
 
   @media (max-width: $screen-sm-min) {
     width: 100%;
+    min-width: 180px;
   }
 
   &.dropdown-open-left {
@@ -288,12 +289,6 @@
     padding: 5px 8px;
     color: $gl-text-color-secondary;
   }
-
-  .badge {
-    position: absolute;
-    right: 8px;
-    top: 5px;
-  }
 }
 
 .droplab-dropdown {
@@ -466,10 +461,6 @@
   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/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 28b2a7cfacd..e71bf04aec7 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -325,7 +325,7 @@
       position: absolute;
       top: 7px;
       right: 15px;
-      z-index: 2;
+      z-index: 300;
 
       li.active {
         font-weight: bold;
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index ac222ad8c82..be7d27df2a0 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -42,18 +42,18 @@
         .key
           = icon('arrow-up', 'aria-label' => 'hidden')
           I
+      %span.badge.pull-right= number_with_delimiter(assigned_issuables_count(:issues))
       %span
         Issues
-      .badge= number_with_delimiter(assigned_issuables_count(:issues))
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
       .shortcut-mappings
         .key
           = icon('arrow-up', 'aria-label' => 'hidden')
           M
+      %span.badge.pull-right= number_with_delimiter(assigned_issuables_count(:merge_requests))
       %span
         Merge Requests
-      .badge= number_with_delimiter(assigned_issuables_count(:merge_requests))
   = nav_link(controller: 'dashboard/snippets') do
     = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do
       .shortcut-mappings
diff --git a/changelogs/unreleased/34468-remove-extra-blank-on-admin-on-mobile.yml b/changelogs/unreleased/34468-remove-extra-blank-on-admin-on-mobile.yml
new file mode 100644
index 00000000000..99291b4c75a
--- /dev/null
+++ b/changelogs/unreleased/34468-remove-extra-blank-on-admin-on-mobile.yml
@@ -0,0 +1,4 @@
+---
+title: Use smaller min-width for dropdown-menu-nav only on mobile
+merge_request: 12528
+author: Takuya Noguchi