summaryrefslogtreecommitdiff
path: root/app/views/layouts/header
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2017-11-15 15:31:17 -0600
committerDrew Blessing <drew@gitlab.com>2017-11-15 15:35:24 -0600
commit0332356d9275d58c1a3050b54c2a6d653299c6df (patch)
treebcdb2afdebb9cfe9f9800a1b783a90a1674e4f9b /app/views/layouts/header
parenta4072db0198896242886d22c644ed91c1016aa8d (diff)
downloadgitlab-ce-0332356d9275d58c1a3050b54c2a6d653299c6df.tar.gz
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/views/layouts/header')
-rw-r--r--app/views/layouts/header/_default.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 1eca412aff9..e2407f6a428 100644
--- 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"