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

Dmitriy Zaporozhets
1 parent d80d4cd9
Showing 6 changed files with 11 additions and 12 deletions Show diff stats
app/assets/fonts/YanoneKaffeesatz-Light.ttf
app/assets/fonts/wire-one.ttf
app/assets/stylesheets/gitlab_bootstrap/fonts.scss
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
app/assets/stylesheets/sections/header.scss
app/views/layouts/_head_panel.html.haml
 @font-face{
-  font-family: Wireone;
-  src: font-url('wire-one.ttf');
+  font-family: Yanone;
+  src: font-url('YanoneKaffeesatz-Light.ttf');
 }
  
 /** Typo **/
@@ -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;
 }
@@ -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;
         }
@@ -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?
1	1	@font-face{
2		- font-family: Wireone;
3		- src: font-url('wire-one.ttf');
	2	+ font-family: Yanone;
	3	+ src: font-url('YanoneKaffeesatz-Light.ttf');
4	4	}
5	5
6	6	/ Typo /
...	...
...	...	@@ -62,8 +62,8 @@
62	62	@mixin header-font {
63	63	color: $style_color;
64	64	text-shadow: 0 1px 1px #FFF;
65		- font-family: 'Wireone', sans-serif;
66		- font-size: 30px;
	65	+ font-family: 'Yanone', sans-serif;
	66	+ font-size: 26px;
67	67	line-height: 42px;
68	68	font-weight: normal;
69	69	}
...	...
...	...	@@ -33,20 +33,19 @@ header {
33	33	*
34	34	*/
35	35	.app_logo {
36		- width: 170px;
37	36	float: left;
	37	+ margin-right: 15px;
38	38	a {
39	39	float: left;
40	40	padding: 0px;
41	41
42	42	h1 {
43		- width: 90px;
44	43	background: url('logo_dark.png') no-repeat 0px 2px;
45	44	float: left;
46		- margin-left: 2px;
47		- padding-left: 45px;
48	45	height: 40px;
	46	+ width: 40px;
49	47	@include header-font;
	48	+ text-indent: -9999px;
50	49	}
51	50	}
52	51	}
...	...	@@ -60,7 +59,7 @@ header {
60	59	position: relative;
61	60	float: left;
62	61	margin: 0;
63		- margin-right: 30px;
	62	+ margin-left: 15px;
64	63	@include header-font;
65	64	}
66	65
...	...	@@ -233,7 +232,7 @@ header {
233	232	.app_logo {
234	233	a {
235	234	h1 {
236		- background: url('logo_white.png') no-repeat 0px 2px;
	235	+ background: url('logo_white.png') no-repeat center center;
237	236	color: #fff;
238	237	text-shadow: 0 1px 1px #111;
239	238	}
...	...
...	...	@@ -2,9 +2,9 @@
2	2	.navbar-inner
3	3	.container
4	4	%div.app_logo
5		- = link_to root_path, class: "home", title: "Home" do
	5	+ = link_to root_path, class: "home has_bottom_tooltip", title: "Dashboard" do
6	6	%h1 GITLAB
7		- %span.separator
	7	+ %span.separator
8	8	%h1.project_name= title
9	9	%ul.nav
10	10	- if current_user.is_admin?
...	...