Commit 6c45e1b1 authored by Thomas Pathier's avatar Thomas Pathier Committed by Phil Hughes
Browse files

Resolve "Fix overlapping separator on the mobile navigation bar"

parent 1900b3ff52d4
...@@ -802,11 +802,7 @@ ...@@ -802,11 +802,7 @@
@include media-breakpoint-down(xs) { @include media-breakpoint-down(xs) {
.navbar-gitlab { .navbar-gitlab {
li.header-projects, li.dropdown {
li.header-groups,
li.header-more,
li.header-new,
li.header-user {
position: static; position: static;
} }
} }
......
...@@ -110,6 +110,10 @@ ...@@ -110,6 +110,10 @@
} }
} }
.navbar-collapse > ul.nav > li:not(.d-none) {
margin: 0 2px;
}
&.menu-expanded { &.menu-expanded {
@include media-breakpoint-down(xs) { @include media-breakpoint-down(xs) {
.title-container { .title-container {
...@@ -117,7 +121,7 @@ ...@@ -117,7 +121,7 @@
} }
.navbar-collapse { .navbar-collapse {
display: block; display: flex;
} }
} }
} }
...@@ -209,7 +213,7 @@ ...@@ -209,7 +213,7 @@
> a { > a {
will-change: color; will-change: color;
margin: 4px 2px; margin: 4px 0;
padding: 6px 8px; padding: 6px 8px;
height: 32px; height: 32px;
...@@ -455,14 +459,11 @@ ...@@ -455,14 +459,11 @@
color: $indigo-900; color: $indigo-900;
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
line-height: 18px; line-height: 18px;
margin: 4px 0 4px 2px;
&:hover { &:hover {
background-color: $white-light; background-color: $white-light;
} }
@include media-breakpoint-down(xs) {
margin-top: $gl-padding-4;
}
} }
.navbar-nav { .navbar-nav {
...@@ -509,12 +510,7 @@ ...@@ -509,12 +510,7 @@
margin-right: -10px; margin-right: -10px;
.nav > li:not(.d-none) { .nav > li:not(.d-none) {
display: table-cell !important; flex: 1;
width: 25%;
a {
margin-right: 8px;
}
} }
} }
} }
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
= link_to admin_impersonation_path, class: 'nav-link impersonation-btn', method: :delete, title: _('Stop impersonation'), aria: { label: _('Stop impersonation') }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do = link_to admin_impersonation_path, class: 'nav-link impersonation-btn', method: :delete, title: _('Stop impersonation'), aria: { label: _('Stop impersonation') }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
= icon('user-secret') = icon('user-secret')
- if header_link?(:sign_in) - if header_link?(:sign_in)
%li.nav-item.m-auto %li.nav-item
%div %div
- sign_in_text = allow_signup? ? _('Sign in / Register') : _('Sign in') - sign_in_text = allow_signup? ? _('Sign in / Register') : _('Sign in')
= link_to sign_in_text, new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in' = link_to sign_in_text, new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in'
......
---
title: "Fix overlapping navbar separator and overflowing navbar dropdown on small displays"
merge_request: 23126
author: Thomas Pathier
type: fix
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