diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-02-12 17:42:08 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-02-12 17:42:08 +0000 |
| commit | 7a8f8714cc65b36b8dbc4fe180eeb73aa2eeba0f (patch) | |
| tree | 9304b6a885333b06e81e08ad85afed61d4a5fbfb | |
| parent | 553c9f3c2f77912bbc9d676747094e609aa96595 (diff) | |
| parent | 8617954dadffd38116662937e3fb9beb55851668 (diff) | |
| download | gitlab-ce-7a8f8714cc65b36b8dbc4fe180eeb73aa2eeba0f.tar.gz | |
Merge branch 'fix_#56347' into 'master'
Fix overlapping empty-header logo
Closes #56347
See merge request gitlab-org/gitlab-ce!24868
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 9 | ||||
| -rw-r--r-- | app/helpers/appearances_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/layouts/header/_empty.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fix_-56347.yml | 5 |
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 |