Commit c1fe37690ac1403b687503819ad4b61322fcfadb
1 parent
cd567ee4
Exists in
master
and in
4 other branches
logo updated
Showing
3 changed files
with
29 additions
and
6 deletions
Show diff stats
7.71 KB
app/assets/stylesheets/top_panel.scss
| @@ -27,7 +27,7 @@ body header { | @@ -27,7 +27,7 @@ body header { | ||
| 27 | margin:0; | 27 | margin:0; |
| 28 | margin-right:30px; | 28 | margin-right:30px; |
| 29 | font-size:20px; | 29 | font-size:20px; |
| 30 | - line-height:28px; | 30 | + line-height:34px; |
| 31 | font-weight:bold; | 31 | font-weight:bold; |
| 32 | color:#666; | 32 | color:#666; |
| 33 | text-shadow: 0 1px 1px #FFF; | 33 | text-shadow: 0 1px 1px #FFF; |
| @@ -57,12 +57,34 @@ body header { | @@ -57,12 +57,34 @@ body header { | ||
| 57 | } | 57 | } |
| 58 | } | 58 | } |
| 59 | } | 59 | } |
| 60 | -.main_links { | ||
| 61 | - width:155px; | 60 | + |
| 61 | +.app_logo { | ||
| 62 | + width:230px; | ||
| 62 | float:left; | 63 | float:left; |
| 63 | 64 | ||
| 64 | a { | 65 | a { |
| 65 | float:left; | 66 | float:left; |
| 67 | + | ||
| 68 | + h1 { | ||
| 69 | + float:left; | ||
| 70 | + margin-left:5px; | ||
| 71 | + font-size:20px; | ||
| 72 | + line-height:34px; | ||
| 73 | + font-weight:bold; | ||
| 74 | + color:#aaa; | ||
| 75 | + text-shadow: 0 1px 1px #FFF; | ||
| 76 | + | ||
| 77 | + &:hover { | ||
| 78 | + color:$active_link_color; | ||
| 79 | + } | ||
| 80 | + } | ||
| 81 | + | ||
| 82 | + img { | ||
| 83 | + float: left; | ||
| 84 | + position: relative; | ||
| 85 | + top: -9px; | ||
| 86 | + width:46px; | ||
| 87 | + } | ||
| 66 | } | 88 | } |
| 67 | } | 89 | } |
| 68 | 90 |
app/views/layouts/_head_panel.html.haml
| @@ -2,12 +2,13 @@ | @@ -2,12 +2,13 @@ | ||
| 2 | %header.top_panel_holder | 2 | %header.top_panel_holder |
| 3 | .wrapper | 3 | .wrapper |
| 4 | .top_panel_content | 4 | .top_panel_content |
| 5 | - %div.main_links | 5 | + %div.app_logo |
| 6 | = link_to root_path, :class => "home", :title => "Home" do | 6 | = link_to root_path, :class => "home", :title => "Home" do |
| 7 | - = image_tag "logo.png", :width => 100 | 7 | + = image_tag "logo_tr.png", :width => 50 |
| 8 | + %h1 GITLAB | ||
| 8 | 9 | ||
| 9 | %h1.project_name= title | 10 | %h1.project_name= title |
| 10 | - .search= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input xlarge" | 11 | + .search= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input" |
| 11 | 12 | ||
| 12 | 13 | ||
| 13 | .account-box | 14 | .account-box |