Commit a52d8c10 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'fix_gitlab-ce#41891' into 'master'

fix gitlab-org/gitlab-ce#41891 (design nitpick)

Closes #41891

See merge request gitlab-org/gitlab-ce!16383
parents 9978602d 3c6d95a6
......@@ -104,7 +104,10 @@
img {
height: 28px;
margin-right: 8px;
+ .logo-text {
margin-left: 8px;
}
}
&.wrap {
......
......@@ -6,8 +6,10 @@
%h1.title
= link_to root_path, title: 'Dashboard', id: 'logo' do
= brand_header_logo
%span.logo-text.hidden-xs
= brand_header_logo_type
- logo_text = brand_header_logo_type
- if logo_text.present?
%span.logo-text.hidden-xs
= logo_text
- if current_user
= render "layouts/nav/dashboard"
......
---
title: 'Fix custom header logo design nitpick: Remove unneeded margin on empty logo text'
merge_request: 16383
author: Markus Doits
type: fixed
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