When a custom header logo is present, don't show GitLab type logo

In the new navigation header, when a user uploads a custom header logo GitLab will still show the 'GitLab' type logo. This is often undesirable as the user may want to upload a logo with their own name present. This change will toggle the GitLab type logo if a custom header logo is present.

When a custom header logo is present, don't show GitLab type logo
0332356d · Drew Blessing · a4072db0 · 0332356d · 0332356d · 0332356d
Commit 0332356d authored Nov 15, 2017 by Drew Blessing
4 changed files
--- a/app/helpers/appearances_helper.rb
+++ b/app/helpers/appearances_helper.rb
@@ -30,4 +30,11 @@ module AppearancesHelper
      render 'shared/logo.svg'
    end
  end
+  # Skip the 'GitLab' type logo when custom brand logo is set
+  def brand_header_logo_type
+    unless brand_item && brand_item.header_logo?
+      render 'shared/logo_type.svg'
+    end
+  end
 end
--- a/app/views/admin/appearances/_form.html.haml
+++ b/app/views/admin/appearances/_form.html.haml
@@ -43,7 +43,7 @@
      = f.hidden_field :header_logo_cache
      = f.file_field :header_logo, class: ""
      .hint
-        Maximum file size is 1MB. Pages are optimized for a 72x72 px header logo
+        Maximum file size is 1MB. Pages are optimized for a 28px tall header logo
  .form-actions
    = f.submit 'Save', class: 'btn btn-save append-right-10'

--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -7,7 +7,7 @@
          = link_to root_path, title: 'Dashboard', id: 'logo' do
            = brand_header_logo
            %span.logo-text.hidden-xs
-              = render 'shared/logo_type.svg'
+              = brand_header_logo_type
        - if current_user
          = render "layouts/nav/dashboard"

--- a/changelogs/unreleased/brand_header_change.yml
+++ b/changelogs/unreleased/brand_header_change.yml
+---
+title: When a custom header logo is present, don't show GitLab type logo
+merge_request:
+author:
+type: changed