Replace Wire font with Yanone. Show only icon as link to dashboard

This commit is contained in:
Dmitriy Zaporozhets 2012-12-24 14:24:45 +02:00
parent d80d4cd92b
commit 2937f35f9a
6 changed files with 11 additions and 12 deletions

Binary file not shown.

Binary file not shown.

View file

@ -1,6 +1,6 @@
@font-face{
font-family: Wireone;
src: font-url('wire-one.ttf');
font-family: Yanone;
src: font-url('YanoneKaffeesatz-Light.ttf');
}
/** Typo **/

View file

@ -62,8 +62,8 @@
@mixin header-font {
color: $style_color;
text-shadow: 0 1px 1px #FFF;
font-family: 'Wireone', sans-serif;
font-size: 30px;
font-family: 'Yanone', sans-serif;
font-size: 26px;
line-height: 42px;
font-weight: normal;
}

View file

@ -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: 30px;
margin-left: 15px;
@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;
}

View file

@ -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?