Commit 3453bc32 authored by Clement Ho's avatar Clement Ho

Merge branch '34468-remove-extra-blank-on-admin-on-mobile' into 'master'

Simplify width for dropdown-menu on mobile

Closes #34468 and #35226

See merge request !12528
parents 2abb40f1 309d4066
...@@ -205,6 +205,7 @@ ...@@ -205,6 +205,7 @@
@media (max-width: $screen-sm-min) { @media (max-width: $screen-sm-min) {
width: 100%; width: 100%;
min-width: 180px;
} }
&.dropdown-open-left { &.dropdown-open-left {
...@@ -288,12 +289,6 @@ ...@@ -288,12 +289,6 @@
padding: 5px 8px; padding: 5px 8px;
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
} }
.badge {
position: absolute;
right: 8px;
top: 5px;
}
} }
.droplab-dropdown { .droplab-dropdown {
...@@ -466,10 +461,6 @@ ...@@ -466,10 +461,6 @@
left: auto; left: auto;
right: 0; right: 0;
margin-top: -5px; margin-top: -5px;
@media (max-width: $screen-xs-max) {
left: 0;
}
} }
.dropdown-menu-selectable { .dropdown-menu-selectable {
......
...@@ -325,7 +325,7 @@ ...@@ -325,7 +325,7 @@
position: absolute; position: absolute;
top: 7px; top: 7px;
right: 15px; right: 15px;
z-index: 2; z-index: 300;
li.active { li.active {
font-weight: bold; font-weight: bold;
......
...@@ -42,18 +42,18 @@ ...@@ -42,18 +42,18 @@
.key .key
= icon('arrow-up', 'aria-label' => 'hidden') = icon('arrow-up', 'aria-label' => 'hidden')
I I
%span.badge.pull-right= number_with_delimiter(assigned_issuables_count(:issues))
%span %span
Issues Issues
.badge= number_with_delimiter(assigned_issuables_count(:issues))
= nav_link(path: 'dashboard#merge_requests') do = nav_link(path: 'dashboard#merge_requests') do
= link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
.shortcut-mappings .shortcut-mappings
.key .key
= icon('arrow-up', 'aria-label' => 'hidden') = icon('arrow-up', 'aria-label' => 'hidden')
M M
%span.badge.pull-right= number_with_delimiter(assigned_issuables_count(:merge_requests))
%span %span
Merge Requests Merge Requests
.badge= number_with_delimiter(assigned_issuables_count(:merge_requests))
= nav_link(controller: 'dashboard/snippets') do = nav_link(controller: 'dashboard/snippets') do
= link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do
.shortcut-mappings .shortcut-mappings
......
---
title: Use smaller min-width for dropdown-menu-nav only on mobile
merge_request: 12528
author: Takuya Noguchi
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment