Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
3c6d95a6
Commit
3c6d95a6
authored
Jan 11, 2018
by
Markus Doits
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove wrong/unneeded margin of custom navigation header logo without logo text
parent
3b029de0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
3 deletions
+13
-3
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+4
-1
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+4
-2
changelogs/unreleased/fix_gitlab-ce-41891.yml
changelogs/unreleased/fix_gitlab-ce-41891.yml
+5
-0
No files found.
app/assets/stylesheets/framework/header.scss
View file @
3c6d95a6
...
@@ -104,7 +104,10 @@
...
@@ -104,7 +104,10 @@
img
{
img
{
height
:
28px
;
height
:
28px
;
margin-right
:
8px
;
+
.logo-text
{
margin-left
:
8px
;
}
}
}
&
.wrap
{
&
.wrap
{
...
...
app/views/layouts/header/_default.html.haml
View file @
3c6d95a6
...
@@ -6,8 +6,10 @@
...
@@ -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
-
logo_text
=
brand_header_logo_type
-
if
logo_text
.
present?
%span
.logo-text.hidden-xs
%span
.logo-text.hidden-xs
=
brand_header_logo_type
=
logo_text
-
if
current_user
-
if
current_user
=
render
"layouts/nav/dashboard"
=
render
"layouts/nav/dashboard"
...
...
changelogs/unreleased/fix_gitlab-ce-41891.yml
0 → 100644
View file @
3c6d95a6
---
title
:
'
Fix
custom
header
logo
design
nitpick:
Remove
unneeded
margin
on
empty
logo
text'
merge_request
:
16383
author
:
Markus Doits
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment