Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2017-11-16 00:31:17 +0300
committerDrew Blessing <drew@gitlab.com>2017-11-16 00:35:24 +0300
commit0332356d9275d58c1a3050b54c2a6d653299c6df (patch)
treebcdb2afdebb9cfe9f9800a1b783a90a1674e4f9b /app/helpers/appearances_helper.rb
parenta4072db0198896242886d22c644ed91c1016aa8d (diff)
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.
Diffstat (limited to 'app/helpers/appearances_helper.rb')
-rw-r--r--app/helpers/appearances_helper.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb
index 8ad94d3f723..df590cf47c8 100644
--- 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