Commit 5b57f72d authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'brand_header_change' into 'master'

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

See merge request gitlab-org/gitlab-ce!15410
parents 5fbda2af 0332356d
...@@ -30,4 +30,11 @@ module AppearancesHelper ...@@ -30,4 +30,11 @@ module AppearancesHelper
render 'shared/logo.svg' render 'shared/logo.svg'
end end
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 end
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
= f.hidden_field :header_logo_cache = f.hidden_field :header_logo_cache
= f.file_field :header_logo, class: "" = f.file_field :header_logo, class: ""
.hint .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 .form-actions
= f.submit 'Save', class: 'btn btn-save append-right-10' = f.submit 'Save', class: 'btn btn-save append-right-10'
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
= link_to root_path, title: 'Dashboard', id: 'logo' do = link_to root_path, title: 'Dashboard', id: 'logo' do
= brand_header_logo = brand_header_logo
%span.logo-text.hidden-xs %span.logo-text.hidden-xs
= render 'shared/logo_type.svg' = brand_header_logo_type
- if current_user - if current_user
= render "layouts/nav/dashboard" = render "layouts/nav/dashboard"
......
---
title: When a custom header logo is present, don't show GitLab type logo
merge_request:
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment