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
2018-01-12 20:42:21 +00:00 · 2018-01-12 20:42:21 +00:00 · a52d8c101d
parent 9978602d52 3c6d95a6d3
commit a52d8c101d
3 changed files with 13 additions and 3 deletions
--- 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
-            %span.logo-text.hidden-xs
-              = brand_header_logo_type
+            - logo_text = brand_header_logo_type
+            - if logo_text.present?
+              %span.logo-text.hidden-xs
+                = 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
@ -0,0 +1,5 @@
+---
+title: 'Fix custom header logo design nitpick: Remove unneeded margin on empty logo text'
+merge_request: 16383
+author: Markus Doits
+type: fixed