Commit 2937f35f9afa51286f563c1a24940ee23a2d7d1b
1 parent
d80d4cd9
Exists in
master
and in
4 other branches
Replace Wire font with Yanone. Show only icon as link to dashboard
Showing
6 changed files
with
11 additions
and
12 deletions
Show diff stats
No preview for this file type
app/assets/fonts/wire-one.ttf
No preview for this file type
app/assets/stylesheets/gitlab_bootstrap/fonts.scss
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
| @@ -62,8 +62,8 @@ | @@ -62,8 +62,8 @@ | ||
| 62 | @mixin header-font { | 62 | @mixin header-font { |
| 63 | color: $style_color; | 63 | color: $style_color; |
| 64 | text-shadow: 0 1px 1px #FFF; | 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 | line-height: 42px; | 67 | line-height: 42px; |
| 68 | font-weight: normal; | 68 | font-weight: normal; |
| 69 | } | 69 | } |
app/assets/stylesheets/sections/header.scss
| @@ -33,20 +33,19 @@ header { | @@ -33,20 +33,19 @@ header { | ||
| 33 | * | 33 | * |
| 34 | */ | 34 | */ |
| 35 | .app_logo { | 35 | .app_logo { |
| 36 | - width: 170px; | ||
| 37 | float: left; | 36 | float: left; |
| 37 | + margin-right: 15px; | ||
| 38 | a { | 38 | a { |
| 39 | float: left; | 39 | float: left; |
| 40 | padding: 0px; | 40 | padding: 0px; |
| 41 | 41 | ||
| 42 | h1 { | 42 | h1 { |
| 43 | - width: 90px; | ||
| 44 | background: url('logo_dark.png') no-repeat 0px 2px; | 43 | background: url('logo_dark.png') no-repeat 0px 2px; |
| 45 | float: left; | 44 | float: left; |
| 46 | - margin-left: 2px; | ||
| 47 | - padding-left: 45px; | ||
| 48 | height: 40px; | 45 | height: 40px; |
| 46 | + width: 40px; | ||
| 49 | @include header-font; | 47 | @include header-font; |
| 48 | + text-indent: -9999px; | ||
| 50 | } | 49 | } |
| 51 | } | 50 | } |
| 52 | } | 51 | } |
| @@ -60,7 +59,7 @@ header { | @@ -60,7 +59,7 @@ header { | ||
| 60 | position: relative; | 59 | position: relative; |
| 61 | float: left; | 60 | float: left; |
| 62 | margin: 0; | 61 | margin: 0; |
| 63 | - margin-right: 30px; | 62 | + margin-left: 15px; |
| 64 | @include header-font; | 63 | @include header-font; |
| 65 | } | 64 | } |
| 66 | 65 | ||
| @@ -233,7 +232,7 @@ header { | @@ -233,7 +232,7 @@ header { | ||
| 233 | .app_logo { | 232 | .app_logo { |
| 234 | a { | 233 | a { |
| 235 | h1 { | 234 | h1 { |
| 236 | - background: url('logo_white.png') no-repeat 0px 2px; | 235 | + background: url('logo_white.png') no-repeat center center; |
| 237 | color: #fff; | 236 | color: #fff; |
| 238 | text-shadow: 0 1px 1px #111; | 237 | text-shadow: 0 1px 1px #111; |
| 239 | } | 238 | } |
app/views/layouts/_head_panel.html.haml
| @@ -2,9 +2,9 @@ | @@ -2,9 +2,9 @@ | ||
| 2 | .navbar-inner | 2 | .navbar-inner |
| 3 | .container | 3 | .container |
| 4 | %div.app_logo | 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 | %h1 GITLAB | 6 | %h1 GITLAB |
| 7 | - %span.separator | 7 | + %span.separator |
| 8 | %h1.project_name= title | 8 | %h1.project_name= title |
| 9 | %ul.nav | 9 | %ul.nav |
| 10 | - if current_user.is_admin? | 10 | - if current_user.is_admin? |