Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
5380a7801674
Commit
6c45e1b1
authored
Nov 27, 2018
by
Thomas Pathier
Committed by
Phil Hughes
Nov 27, 2018
Browse files
Resolve "Fix overlapping separator on the mobile navigation bar"
parent
1900b3ff52d4
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/framework/dropdowns.scss
View file @
5380a780
...
...
@@ -802,11 +802,7 @@
@include
media-breakpoint-down
(
xs
)
{
.navbar-gitlab
{
li
.header-projects
,
li
.header-groups
,
li
.header-more
,
li
.header-new
,
li
.header-user
{
li
.dropdown
{
position
:
static
;
}
}
...
...
app/assets/stylesheets/framework/header.scss
View file @
5380a780
...
...
@@ -110,6 +110,10 @@
}
}
.navbar-collapse
>
ul
.nav
>
li
:not
(
.d-none
)
{
margin
:
0
2px
;
}
&
.menu-expanded
{
@include
media-breakpoint-down
(
xs
)
{
.title-container
{
...
...
@@ -117,7 +121,7 @@
}
.navbar-collapse
{
display
:
block
;
display
:
flex
;
}
}
}
...
...
@@ -209,7 +213,7 @@
>
a
{
will-change
:
color
;
margin
:
4px
2px
;
margin
:
4px
0
;
padding
:
6px
8px
;
height
:
32px
;
...
...
@@ -455,14 +459,11 @@
color
:
$indigo-900
;
font-weight
:
$gl-font-weight-bold
;
line-height
:
18px
;
margin
:
4px
0
4px
2px
;
&
:hover
{
background-color
:
$white-light
;
}
@include
media-breakpoint-down
(
xs
)
{
margin-top
:
$gl-padding-4
;
}
}
.navbar-nav
{
...
...
@@ -509,12 +510,7 @@
margin-right
:
-10px
;
.nav
>
li
:not
(
.d-none
)
{
display
:
table-cell
!
important
;
width
:
25%
;
a
{
margin-right
:
8px
;
}
flex
:
1
;
}
}
}
...
...
app/views/layouts/header/_default.html.haml
View file @
5380a780
...
...
@@ -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
=
icon
(
'user-secret'
)
-
if
header_link?
(
:sign_in
)
%li
.nav-item
.m-auto
%li
.nav-item
%div
-
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'
...
...
changelogs/unreleased/53874-navbar-lowres.yml
0 → 100644
View file @
5380a780
---
title
:
"
Fix
overlapping
navbar
separator
and
overflowing
navbar
dropdown
on
small
displays"
merge_request
:
23126
author
:
Thomas Pathier
type
:
fix
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment