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
Boxiang Sun
gitlab-ce
Commits
8617954d
Commit
8617954d
authored
Feb 12, 2019
by
joola
Committed by
Annabel Dunstone Gray
Feb 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace useless divs with flex layout in navbar
Notable changes proposed by @pslaughter
parent
553c9f3c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
9 deletions
+11
-9
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+4
-5
app/helpers/appearances_helper.rb
app/helpers/appearances_helper.rb
+1
-1
app/views/layouts/header/_empty.html.haml
app/views/layouts/header/_empty.html.haml
+1
-3
changelogs/unreleased/fix_-56347.yml
changelogs/unreleased/fix_-56347.yml
+5
-0
No files found.
app/assets/stylesheets/framework/header.scss
View file @
8617954d
...
@@ -565,15 +565,14 @@
...
@@ -565,15 +565,14 @@
}
}
.navbar-empty
{
.navbar-empty
{
justify-content
:
center
;
height
:
$header-height
;
height
:
$header-height
;
background
:
$white-light
;
background
:
$white-light
;
border-bottom
:
1px
solid
$white-normal
;
border-bottom
:
1px
solid
$white-normal
;
.mx-auto
{
.tanuki-logo
,
.tanuki-logo
,
.brand-header-logo
{
img
{
max-height
:
100%
;
height
:
36px
;
}
}
}
}
}
...
...
app/helpers/appearances_helper.rb
View file @
8617954d
...
@@ -28,7 +28,7 @@ module AppearancesHelper
...
@@ -28,7 +28,7 @@ module AppearancesHelper
def
brand_header_logo
def
brand_header_logo
if
current_appearance
&
.
header_logo?
if
current_appearance
&
.
header_logo?
image_tag
current_appearance
.
header_logo_path
image_tag
current_appearance
.
header_logo_path
,
class:
'brand-header-logo'
else
else
render
'shared/logo.svg'
render
'shared/logo.svg'
end
end
...
...
app/views/layouts/header/_empty.html.haml
View file @
8617954d
%header
.navbar.fixed-top.navbar-empty
%header
.navbar.fixed-top.navbar-empty
.container
=
brand_header_logo
.mx-auto
=
brand_header_logo
changelogs/unreleased/fix_-56347.yml
0 → 100644
View file @
8617954d
---
title
:
Fix overlapping empty-header logo
merge_request
:
24868
author
:
Jonas L.
type
:
fixed
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