Merge branch 'fix_gitlab-ce#41891' into 'master'

fix gitlab-org/gitlab-ce#41891 (design nitpick) Closes #41891 See merge request gitlab-org/gitlab-ce!16383

Merge branch 'fix_gitlab-ce#41891' into 'master'
a52d8c10 · Annabel Dunstone Gray · 9978602d · 3c6d95a6 · a52d8c10 · a52d8c10
Commit a52d8c10 authored Jan 12, 2018 by Annabel Dunstone Gray
Showing with 12 additions and 2 deletions

header.scss app/assets/stylesheets/framework/header.scss +4 -1

_default.html.haml app/views/layouts/header/_default.html.haml +3 -1

fix_gitlab-ce-41891.yml changelogs/unreleased/fix_gitlab-ce-41891.yml +5 -0

No files found.
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -104,7 +104,10 @@

      img {
        height: 28px;
-        margin-right: 8px;
+
+        + .logo-text {
+          margin-left: 8px;
+        }
      }

      &.wrap {

--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -6,8 +6,10 @@
        %h1.title
          = link_to root_path, title: 'Dashboard', id: 'logo' do
            = brand_header_logo
+            - logo_text = brand_header_logo_type
+            - if logo_text.present?
              %span.logo-text.hidden-xs
-              = brand_header_logo_type
+                = logo_text

        - if current_user
          = render "layouts/nav/dashboard"

--- a/changelogs/unreleased/fix_gitlab-ce-41891.yml
+++ b/changelogs/unreleased/fix_gitlab-ce-41891.yml
+---
+title: 'Fix custom header logo design nitpick: Remove unneeded margin on empty logo text'
+merge_request: 16383
+author: Markus Doits
+type: fixed