Commit 7a8f8714 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'fix_#56347' into 'master'

Fix overlapping empty-header logo

Closes #56347

See merge request gitlab-org/gitlab-ce!24868
parents 553c9f3c 8617954d
......@@ -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;
}
.tanuki-logo,
.brand-header-logo {
max-height: 100%;
}
}
......
......@@ -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
......
%header.navbar.fixed-top.navbar-empty
.container
.mx-auto
= brand_header_logo
= brand_header_logo
---
title: Fix overlapping empty-header logo
merge_request: 24868
author: Jonas L.
type: fixed
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment