summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-06-07 16:16:23 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-06-07 16:16:23 +0000
commit4e18206f84ac6a8149b816c3a3cdd9a1b141d709 (patch)
treec828ad8fb9807d3add75948e57e175e6883b9e3e /app
parent3b3b705ab5ca690459e40a63e101372e34f2701b (diff)
parentce3c9776a97734ce282b7e85875a7cc457554c0f (diff)
downloadgitlab-ce-4e18206f84ac6a8149b816c3a3cdd9a1b141d709.tar.gz
Merge branch '47504-mobile-nav' into 'master'
Resolve "Navbar is broken on mobile" Closes #47504 See merge request gitlab-org/gitlab-ce!19550
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/header.scss10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index f2ac77819d5..6fbc624dee4 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -139,6 +139,8 @@
}
.nav {
+ flex-wrap: nowrap;
+
> li:not(.d-none) a {
@include media-breakpoint-down(xs) {
margin-left: 0;
@@ -158,11 +160,12 @@
}
.navbar-toggler {
+ position: relative;
right: -10px;
border-radius: 0;
min-width: 45px;
padding: 0;
- margin-right: -7px;
+ margin: $gl-padding-8 -7px $gl-padding-8 0;
font-size: 14px;
text-align: center;
color: currentColor;
@@ -186,6 +189,7 @@
display: -webkit-flex;
display: flex;
padding-right: 10px;
+ flex-direction: row;
}
li {
@@ -290,6 +294,10 @@
margin: 8px;
}
}
+
+ .dropdown-menu {
+ position: absolute;
+ }
}
.navbar-sub-nav {