From 8617954dadffd38116662937e3fb9beb55851668 Mon Sep 17 00:00:00 2001
From: joola <ljonas@riseup.net>
Date: Tue, 12 Feb 2019 17:42:08 +0000
Subject: Replace useless divs with flex layout in navbar

Notable changes proposed by @pslaughter
---
 app/assets/stylesheets/framework/header.scss | 9 ++++-----
 app/helpers/appearances_helper.rb            | 2 +-
 app/views/layouts/header/_empty.html.haml    | 4 +---
 changelogs/unreleased/fix_-56347.yml         | 5 +++++
 4 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 changelogs/unreleased/fix_-56347.yml

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 36dd1cee4de..23dcc1817b1 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -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%;
   }
 }
 
diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb
index 473c90c882c..7fbbbb04154 100644
--- a/app/helpers/appearances_helper.rb
+++ b/app/helpers/appearances_helper.rb
@@ -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
diff --git a/app/views/layouts/header/_empty.html.haml b/app/views/layouts/header/_empty.html.haml
index 2dfc787b7a8..348ce18b122 100644
--- a/app/views/layouts/header/_empty.html.haml
+++ b/app/views/layouts/header/_empty.html.haml
@@ -1,4 +1,2 @@
 %header.navbar.fixed-top.navbar-empty
-  .container
-    .mx-auto
-      = brand_header_logo
+  = brand_header_logo
diff --git a/changelogs/unreleased/fix_-56347.yml b/changelogs/unreleased/fix_-56347.yml
new file mode 100644
index 00000000000..1d03ed8864c
--- /dev/null
+++ b/changelogs/unreleased/fix_-56347.yml
@@ -0,0 +1,5 @@
+---
+title: Fix overlapping empty-header logo
+merge_request: 24868
+author: Jonas L.
+type: fixed
-- 
cgit v1.2.1