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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9b7d8f5e
Commit
9b7d8f5e
authored
Jul 21, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '35236-svg-logo' into 'master'
Use custom font SVG for logo Closes #35236 See merge request !13018
parents
764e5f66
283f2f6e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
app/assets/stylesheets/new_nav.scss
app/assets/stylesheets/new_nav.scss
+14
-2
app/views/layouts/header/_new.html.haml
app/views/layouts/header/_new.html.haml
+2
-2
app/views/shared/_logo_type.svg
app/views/shared/_logo_type.svg
+1
-0
No files found.
app/assets/stylesheets/new_nav.scss
View file @
9b7d8f5e
...
@@ -41,10 +41,22 @@ header.navbar-gitlab-new {
...
@@ -41,10 +41,22 @@ header.navbar-gitlab-new {
}
}
}
}
.logo-text
{
line-height
:
initial
;
svg
{
width
:
55px
;
height
:
15px
;
margin
:
0
;
fill
:
$white-light
;
}
}
&
:hover
,
&
:hover
,
&
:focus
{
&
:focus
{
color
:
$tanuki-yellow
;
.logo-text
svg
{
text-decoration
:
none
;
fill
:
$tanuki-yellow
;
}
}
}
}
}
}
}
...
...
app/views/layouts/header/_new.html.haml
View file @
9b7d8f5e
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
%h1
.title
%h1
.title
=
link_to
root_path
,
title:
'Dashboard'
do
=
link_to
root_path
,
title:
'Dashboard'
do
=
brand_header_logo
=
brand_header_logo
%span
.hidden-xs
%span
.
logo-text.
hidden-xs
GitLab
=
render
'shared/logo_type.svg'
-
if
current_user
-
if
current_user
=
render
"layouts/nav/new_dashboard"
=
render
"layouts/nav/new_dashboard"
...
...
app/views/shared/_logo_type.svg
0 → 100644
View file @
9b7d8f5e
<svg
xmlns=
"http://www.w3.org/2000/svg"
viewBox=
"0 0 617 169"
enable-background=
"new 0 0 617 169"
><path
d=
"m315.26 2.969h-21.8l.1 162.5h88.3v-20.1h-66.5l-.1-142.4"
/><path
d=
"m-511.44-6.331c-5.5 5.7-14.6 11.4-27 11.4-16.6 0-23.3-8.2-23.3-18.9 0-16.1 11.2-23.8 35-23.8 4.5 0 11.7.5 15.4 1.2v30.1h-.1m-22.6-98.5c-17.6 0-33.8 6.2-46.4 16.7l7.7 13.4c8.9-5.2 19.8-10.4 35.5-10.4 17.9 0 25.8 9.2 25.8 24.6v7.9c-3.5-.7-10.7-1.2-15.1-1.2-38.2 0-57.6 13.4-57.6 41.4 0 25.1 15.4 37.7 38.7 37.7 15.7 0 30.8-7.2 36-18.9l4 15.9h15.4v-83.2c-.1-26.3-11.5-43.9-44-43.9"
transform=
"translate(977.33 143.28)"
/><path
d=
"m-542.14 5.969c-8.2 0-15.4-1-20.8-3.5v-67.3-7.8c7.4-6.2 16.6-10.7 28.3-10.7 21.1 0 29.2 14.9 29.2 39 0 34.2-13.1 50.3-36.7 50.3m9.2-110.6c-19.5 0-30 13.3-30 13.3v-21l-.1-27.8h-9.8-11.5l.1 158.5c10.7 4.5 25.3 6.9 41.2 6.9 40.7 0 60.3-26 60.3-70.9-.1-35.5-18.2-59-50.2-59"
transform=
"translate(1099.77 143.13)"
/><path
d=
"m-506.14-123.03c19.3 0 31.8 6.4 39.9 12.9l9.4-16.3c-12.7-11.2-29.9-17.2-48.3-17.2-46.4 0-78.9 28.3-78.9 85.4 0 59.8 35.1 83.1 75.2 83.1 20.1 0 37.2-4.7 48.4-9.4l-.5-63.9v-7.5-12.6h-59.5v20.1h38l.5 48.5c-5 2.5-13.6 4.5-25.3 4.5-32.2 0-53.8-20.3-53.8-63-.1-43.5 22.2-64.6 54.9-64.6"
transform=
"translate(584.04 143.63)"
/><path
d=
"m-562.14-139.63h-21.3l.1 27.3v11.2 6.5 11.4 65 .2c0 26.3 11.4 43.9 43.9 43.9 4.5 0 8.9-.4 13.1-1.2v-19.1c-3.1.5-6.4.7-9.9.7-17.9 0-25.8-9.2-25.8-24.6v-65h35.7v-17.8h-35.7l-.1-38.5"
transform=
"translate(793.57 142.58)"
/><path
d=
"m155.96 165.47h21.3v-124h-21.3v124"
/><path
d=
"m155.96 24.369h21.3v-21.3h-21.3v21.3"
/></svg>
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