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 0000000000000000000000000000000000000000..3a38daa0cdad7911f21e15d6627b3150ab035830 GIT binary patch literal 561 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4mJh`hLv7E=NK3m7>k44ofy`glX=O&z`&N| z?e47Xt(1 zMo$;V5Rcu21Y z%k|oL*2Fcd4`>_je)(>1!eR%dpv3iO-?Z)itX_IHe%B73H>+RiHk`gGnW}9bw5lFxzA`* z@Le`kRjKZz$0;`M+BE4)OzAUkr+r&eZ*pn;|bT>!| zwx@lIKEdkB{QFE~+B-(+cXd~ePu$pL*Lfng+bP0l+XkKr^xkM literal 0 HcmV?d00001 diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..2d08c9f682593351b754d46466117222b64ff260 GIT binary patch literal 3001 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index a360b21aea4..76a629777bc 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 2490aa9226a..d4b695d856a 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 f65f20ea722..eb8e8ef4fe4 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 -- GitLab