From 5e3b7314bdce32006653536e1ce8dbfa5b5ae288 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 19 Jan 2012 21:00:50 +0200 Subject: [PATCH] gitlab logo added to top panel --- app/assets/images/Arrow-Right-UI.PNG | Bin 0 -> 561 bytes app/assets/images/logo.png | Bin 0 -> 3001 bytes app/assets/stylesheets/style.scss | 10 ++++++++-- app/assets/stylesheets/top_panel.scss | 16 +++------------- app/views/layouts/_head_panel.html.haml | 4 +--- 5 files changed, 12 insertions(+), 18 deletions(-) create mode 100644 app/assets/images/Arrow-Right-UI.PNG create mode 100644 app/assets/images/logo.png diff --git a/app/assets/images/Arrow-Right-UI.PNG b/app/assets/images/Arrow-Right-UI.PNG new file mode 100644 index 0000000..3a38daa Binary files /dev/null and b/app/assets/images/Arrow-Right-UI.PNG differ diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png new file mode 100644 index 0000000..2d08c9f Binary files /dev/null and b/app/assets/images/logo.png differ diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index a360b21..76a6297 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -435,7 +435,12 @@ header .account-box{ float: right; display: block; cursor: pointer;} -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;} +header .account-box img{ + border-radius: 4px; + right: 20px; + position: absolute; + width: 33px; height: 33px; + display: block; box-shadow: 0 1px 2px black; top:0;} header .account-box img:after{ content: " "; display: block; @@ -459,7 +464,8 @@ float: right; .account-box.hover{height: 138px;} .account-box:hover > .account-links{display: block;} -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;} +header .account-links{ + 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;} header .account-links:before { content: "."; width:0; diff --git a/app/assets/stylesheets/top_panel.scss b/app/assets/stylesheets/top_panel.scss index 2490aa9..d4b695d 100644 --- a/app/assets/stylesheets/top_panel.scss +++ b/app/assets/stylesheets/top_panel.scss @@ -1,19 +1,9 @@ .main_links { - width:90px; - margin-right:40px; + width:130px; float:left; - background:#ddd; - @include round-borders-all(8px); - border-color:#ccc; - a { - position: relative; + a { float:left; - padding: 3px 10px; - - img { - width: 22px; - } } } @@ -88,7 +78,7 @@ body header { margin-right:30px; font-size:16px; font-weight:bold; - padding:5px 7px; + padding:8px; color:#333; } diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml index f65f20e..eb8e8ef 100644 --- a/app/views/layouts/_head_panel.html.haml +++ b/app/views/layouts/_head_panel.html.haml @@ -4,9 +4,7 @@ .top_panel_content %div.main_links = link_to root_path, :class => "home", :title => "Home" do - = image_tag "Home-UI.PNG" - = link_to projects_path, :title => "Projects" do - = image_tag "Storage-UI.PNG" + = image_tag "logo.png", :width => 100 - if project_layout .project_name -- libgit2 0.21.2