Commit 5e3b7314bdce32006653536e1ce8dbfa5b5ae288
1 parent
00d7bfda
Exists in
master
and in
4 other branches
gitlab logo added to top panel
Showing
5 changed files
with
12 additions
and
18 deletions
Show diff stats
561 Bytes
2.93 KB
app/assets/stylesheets/style.scss
| @@ -435,7 +435,12 @@ header .account-box{ | @@ -435,7 +435,12 @@ header .account-box{ | ||
| 435 | float: right; | 435 | float: right; |
| 436 | display: block; | 436 | display: block; |
| 437 | cursor: pointer;} | 437 | cursor: pointer;} |
| 438 | -header .account-box img{ border-radius: 4px; right: 20px; position: absolute; width: 38px; height: 38px; display: block; box-shadow: 0 1px 2px black; top:-3px;} | 438 | +header .account-box img{ |
| 439 | + border-radius: 4px; | ||
| 440 | + right: 20px; | ||
| 441 | + position: absolute; | ||
| 442 | + width: 33px; height: 33px; | ||
| 443 | + display: block; box-shadow: 0 1px 2px black; top:0;} | ||
| 439 | header .account-box img:after{ | 444 | header .account-box img:after{ |
| 440 | content: " "; | 445 | content: " "; |
| 441 | display: block; | 446 | display: block; |
| @@ -459,7 +464,8 @@ float: right; | @@ -459,7 +464,8 @@ float: right; | ||
| 459 | .account-box.hover{height: 138px;} | 464 | .account-box.hover{height: 138px;} |
| 460 | 465 | ||
| 461 | .account-box:hover > .account-links{display: block;} | 466 | .account-box:hover > .account-links{display: block;} |
| 462 | -header .account-links{background: white; display: none; border-radius: 5px; width: 100px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); position:relative;} | 467 | +header .account-links{ |
| 468 | + background: #79C3E0; display: none; border-radius: 5px; width: 100px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); position:relative;} | ||
| 463 | header .account-links:before { | 469 | header .account-links:before { |
| 464 | content: "."; | 470 | content: "."; |
| 465 | width:0; | 471 | width:0; |
app/assets/stylesheets/top_panel.scss
| 1 | .main_links { | 1 | .main_links { |
| 2 | - width:90px; | ||
| 3 | - margin-right:40px; | 2 | + width:130px; |
| 4 | float:left; | 3 | float:left; |
| 5 | - background:#ddd; | ||
| 6 | - @include round-borders-all(8px); | ||
| 7 | - border-color:#ccc; | ||
| 8 | 4 | ||
| 9 | - a { | ||
| 10 | - position: relative; | 5 | + a { |
| 11 | float:left; | 6 | float:left; |
| 12 | - padding: 3px 10px; | ||
| 13 | - | ||
| 14 | - img { | ||
| 15 | - width: 22px; | ||
| 16 | - } | ||
| 17 | } | 7 | } |
| 18 | } | 8 | } |
| 19 | 9 | ||
| @@ -88,7 +78,7 @@ body header { | @@ -88,7 +78,7 @@ body header { | ||
| 88 | margin-right:30px; | 78 | margin-right:30px; |
| 89 | font-size:16px; | 79 | font-size:16px; |
| 90 | font-weight:bold; | 80 | font-weight:bold; |
| 91 | - padding:5px 7px; | 81 | + padding:8px; |
| 92 | color:#333; | 82 | color:#333; |
| 93 | } | 83 | } |
| 94 | 84 |
app/views/layouts/_head_panel.html.haml
| @@ -4,9 +4,7 @@ | @@ -4,9 +4,7 @@ | ||
| 4 | .top_panel_content | 4 | .top_panel_content |
| 5 | %div.main_links | 5 | %div.main_links |
| 6 | = link_to root_path, :class => "home", :title => "Home" do | 6 | = link_to root_path, :class => "home", :title => "Home" do |
| 7 | - = image_tag "Home-UI.PNG" | ||
| 8 | - = link_to projects_path, :title => "Projects" do | ||
| 9 | - = image_tag "Storage-UI.PNG" | 7 | + = image_tag "logo.png", :width => 100 |
| 10 | 8 | ||
| 11 | - if project_layout | 9 | - if project_layout |
| 12 | .project_name | 10 | .project_name |