Skip to content

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

Drew Blessing requested to merge dblessing/gitlab-ce:brand_header_change into master

What does this MR do?

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.

The problem was brought up in #ux chat. I got a wild hair so I decided to go see if I could find a workable solution quickly.

Are there points in the code the reviewer needs to double check?

I changed the help text on the appearances form page. It used to say the pages were optimized for 72x72 logos. The logo in the header is set to 28px height so I think that's a more appropriate value here, but I'm not 100% sure if there's some other reason that we may want to say 72px.

Screenshots (if relevant)

Before:

Screen_Shot_2017-11-15_at_3.30.46_PM

After:

Screen_Shot_2017-11-15_at_3.30.14_PM

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Merge request reports