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
Léo-Paul Géneau
gitlab-ce
Commits
2937f35f
Commit
2937f35f
authored
Dec 24, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace Wire font with Yanone. Show only icon as link to dashboard
parent
d80d4cd9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
12 deletions
+11
-12
app/assets/fonts/YanoneKaffeesatz-Light.ttf
app/assets/fonts/YanoneKaffeesatz-Light.ttf
+0
-0
app/assets/fonts/wire-one.ttf
app/assets/fonts/wire-one.ttf
+0
-0
app/assets/stylesheets/gitlab_bootstrap/fonts.scss
app/assets/stylesheets/gitlab_bootstrap/fonts.scss
+2
-2
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+2
-2
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+5
-6
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+2
-2
No files found.
app/assets/fonts/YanoneKaffeesatz-Light.ttf
0 → 100644
View file @
2937f35f
File added
app/assets/fonts/wire-one.ttf
deleted
100644 → 0
View file @
d80d4cd9
File deleted
app/assets/stylesheets/gitlab_bootstrap/fonts.scss
View file @
2937f35f
@font-face
{
font-family
:
Wire
one
;
src
:
font-url
(
'
wire-one
.ttf'
);
font-family
:
Yan
one
;
src
:
font-url
(
'
YanoneKaffeesatz-Light
.ttf'
);
}
/** Typo **/
...
...
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
View file @
2937f35f
...
...
@@ -62,8 +62,8 @@
@mixin
header-font
{
color
:
$style_color
;
text-shadow
:
0
1px
1px
#FFF
;
font-family
:
'
Wire
one'
,
sans-serif
;
font-size
:
30
px
;
font-family
:
'
Yan
one'
,
sans-serif
;
font-size
:
26
px
;
line-height
:
42px
;
font-weight
:
normal
;
}
app/assets/stylesheets/sections/header.scss
View file @
2937f35f
...
...
@@ -33,20 +33,19 @@ header {
*
*/
.app_logo
{
width
:
170px
;
float
:
left
;
margin-right
:
15px
;
a
{
float
:
left
;
padding
:
0px
;
h1
{
width
:
90px
;
background
:
url('logo_dark.png')
no-repeat
0px
2px
;
float
:
left
;
margin-left
:
2px
;
padding-left
:
45px
;
height
:
40px
;
width
:
40px
;
@include
header-font
;
text-indent
:
-9999px
;
}
}
}
...
...
@@ -60,7 +59,7 @@ header {
position
:
relative
;
float
:
left
;
margin
:
0
;
margin-
right
:
30
px
;
margin-
left
:
15
px
;
@include
header-font
;
}
...
...
@@ -233,7 +232,7 @@ header {
.app_logo
{
a
{
h1
{
background
:
url('logo_white.png')
no-repeat
0px
2px
;
background
:
url('logo_white.png')
no-repeat
center
center
;
color
:
#fff
;
text-shadow
:
0
1px
1px
#111
;
}
...
...
app/views/layouts/_head_panel.html.haml
View file @
2937f35f
...
...
@@ -2,9 +2,9 @@
.navbar-inner
.container
%div
.app_logo
=
link_to
root_path
,
class:
"home
"
,
title:
"Home
"
do
=
link_to
root_path
,
class:
"home
has_bottom_tooltip"
,
title:
"Dashboard
"
do
%h1
GITLAB
%span
.separator
%span
.separator
%h1
.project_name
=
title
%ul
.nav
-
if
current_user
.
is_admin?
...
...
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