Replace Wire font with Yanone. Show only icon as link to dashboard
This commit is contained in:
parent
d80d4cd92b
commit
2937f35f9a
BIN
app/assets/fonts/YanoneKaffeesatz-Light.ttf
Normal file
BIN
app/assets/fonts/YanoneKaffeesatz-Light.ttf
Normal file
Binary file not shown.
Binary file not shown.
|
@ -1,6 +1,6 @@
|
||||||
@font-face{
|
@font-face{
|
||||||
font-family: Wireone;
|
font-family: Yanone;
|
||||||
src: font-url('wire-one.ttf');
|
src: font-url('YanoneKaffeesatz-Light.ttf');
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Typo **/
|
/** Typo **/
|
||||||
|
|
|
@ -62,8 +62,8 @@
|
||||||
@mixin header-font {
|
@mixin header-font {
|
||||||
color: $style_color;
|
color: $style_color;
|
||||||
text-shadow: 0 1px 1px #FFF;
|
text-shadow: 0 1px 1px #FFF;
|
||||||
font-family: 'Wireone', sans-serif;
|
font-family: 'Yanone', sans-serif;
|
||||||
font-size: 30px;
|
font-size: 26px;
|
||||||
line-height: 42px;
|
line-height: 42px;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,20 +33,19 @@ header {
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
.app_logo {
|
.app_logo {
|
||||||
width: 170px;
|
|
||||||
float: left;
|
float: left;
|
||||||
|
margin-right: 15px;
|
||||||
a {
|
a {
|
||||||
float: left;
|
float: left;
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
|
|
||||||
h1 {
|
h1 {
|
||||||
width: 90px;
|
|
||||||
background: url('logo_dark.png') no-repeat 0px 2px;
|
background: url('logo_dark.png') no-repeat 0px 2px;
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: 2px;
|
|
||||||
padding-left: 45px;
|
|
||||||
height: 40px;
|
height: 40px;
|
||||||
|
width: 40px;
|
||||||
@include header-font;
|
@include header-font;
|
||||||
|
text-indent: -9999px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -60,7 +59,7 @@ header {
|
||||||
position: relative;
|
position: relative;
|
||||||
float: left;
|
float: left;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
margin-right: 30px;
|
margin-left: 15px;
|
||||||
@include header-font;
|
@include header-font;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -233,7 +232,7 @@ header {
|
||||||
.app_logo {
|
.app_logo {
|
||||||
a {
|
a {
|
||||||
h1 {
|
h1 {
|
||||||
background: url('logo_white.png') no-repeat 0px 2px;
|
background: url('logo_white.png') no-repeat center center;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
text-shadow: 0 1px 1px #111;
|
text-shadow: 0 1px 1px #111;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
.navbar-inner
|
.navbar-inner
|
||||||
.container
|
.container
|
||||||
%div.app_logo
|
%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
|
%h1 GITLAB
|
||||||
%span.separator
|
%span.separator
|
||||||
%h1.project_name= title
|
%h1.project_name= title
|
||||||
%ul.nav
|
%ul.nav
|
||||||
- if current_user.is_admin?
|
- if current_user.is_admin?
|
||||||
|
|
Loading…
Reference in a new issue