kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Replace useless divs with flex layout in navbar 

Notable changes proposed by @pslaughter
This commit is contained in:
joola 2019-02-12 17:42:08 +00:00 committed by Annabel Dunstone Gray
parent 553c9f3c2f
commit 8617954dad
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/framework/header.scss
View File

@ -565,15 +565,14 @@
}
.navbar-empty {
justify-content: center;
height: $header-height;
background: $white-light;
border-bottom: 1px solid $white-normal;
.mx-auto {
.tanuki-logo,
img {
height: 36px;
}
.brand-header-logo {
max-height: 100%;
}
}

2
app/helpers/appearances_helper.rb
View File

@ -28,7 +28,7 @@ module AppearancesHelper
def brand_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
render 'shared/logo.svg'
end

2
app/views/layouts/header/_empty.html.haml
View File

@ -1,4 +1,2 @@
%header.navbar.fixed-top.navbar-empty
.container
.mx-auto
= brand_header_logo

5
changelogs/unreleased/fix_-56347.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix overlapping empty-header logo
merge_request: 24868
author: Jonas L.
type: fixed