summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoola <ljonas@riseup.net>2019-02-12 17:42:08 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-02-12 17:42:08 +0000
commit8617954dadffd38116662937e3fb9beb55851668 (patch)
tree9304b6a885333b06e81e08ad85afed61d4a5fbfb
parent553c9f3c2f77912bbc9d676747094e609aa96595 (diff)
downloadgitlab-ce-8617954dadffd38116662937e3fb9beb55851668.tar.gz
Replace useless divs with flex layout in navbar
Notable changes proposed by @pslaughter
-rw-r--r--app/assets/stylesheets/framework/header.scss9
-rw-r--r--app/helpers/appearances_helper.rb2
-rw-r--r--app/views/layouts/header/_empty.html.haml4
-rw-r--r--changelogs/unreleased/fix_-56347.yml5
4 files changed, 11 insertions, 9 deletions
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