Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
a7a6f80c
Commit
a7a6f80c
authored
Nov 27, 2018
by
Thomas Pathier
Committed by
Phil Hughes
Nov 27, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Fix overlapping separator on the mobile navigation bar"
parent
681d7139
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
18 deletions
+15
-18
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+1
-5
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+8
-12
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
changelogs/unreleased/53874-navbar-lowres.yml
changelogs/unreleased/53874-navbar-lowres.yml
+5
-0
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
a7a6f80c
...
@@ -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
;
}
}
}
}
...
...
app/assets/stylesheets/framework/header.scss
View file @
a7a6f80c
...
@@ -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
;
}
}
}
}
}
}
}
...
...
app/views/layouts/header/_default.html.haml
View file @
a7a6f80c
...
@@ -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'
...
...
changelogs/unreleased/53874-navbar-lowres.yml
0 → 100644
View file @
a7a6f80c
---
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