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
This commit is contained in:
commit
a52d8c101d
|
@ -104,7 +104,10 @@
|
||||||
|
|
||||||
img {
|
img {
|
||||||
height: 28px;
|
height: 28px;
|
||||||
margin-right: 8px;
|
|
||||||
|
+ .logo-text {
|
||||||
|
margin-left: 8px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.wrap {
|
&.wrap {
|
||||||
|
|
|
@ -6,8 +6,10 @@
|
||||||
%h1.title
|
%h1.title
|
||||||
= 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
|
- logo_text = brand_header_logo_type
|
||||||
= brand_header_logo_type
|
- if logo_text.present?
|
||||||
|
%span.logo-text.hidden-xs
|
||||||
|
= logo_text
|
||||||
|
|
||||||
- if current_user
|
- if current_user
|
||||||
= render "layouts/nav/dashboard"
|
= render "layouts/nav/dashboard"
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: 'Fix custom header logo design nitpick: Remove unneeded margin on empty logo text'
|
||||||
|
merge_request: 16383
|
||||||
|
author: Markus Doits
|
||||||
|
type: fixed
|
Loading…
Reference in New Issue