diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-19 21:00:50 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-19 21:00:50 +0200 |
commit | 5e3b7314bdce32006653536e1ce8dbfa5b5ae288 (patch) | |
tree | 7eeac23b87051abb38e70f1223e2ba7ab7febb62 | |
parent | 00d7bfda95087297ea4205946092185d77d1a872 (diff) | |
download | gitlab-ce-5e3b7314bdce32006653536e1ce8dbfa5b5ae288.tar.gz |
gitlab logo added to top panel
-rw-r--r-- | app/assets/images/Arrow-Right-UI.PNG | bin | 0 -> 561 bytes | |||
-rw-r--r-- | app/assets/images/logo.png | bin | 0 -> 3001 bytes | |||
-rw-r--r-- | app/assets/stylesheets/style.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/top_panel.scss | 16 | ||||
-rw-r--r-- | app/views/layouts/_head_panel.html.haml | 4 |
5 files changed, 12 insertions, 18 deletions
diff --git a/app/assets/images/Arrow-Right-UI.PNG b/app/assets/images/Arrow-Right-UI.PNG Binary files differnew file mode 100644 index 00000000000..3a38daa0cda --- /dev/null +++ b/app/assets/images/Arrow-Right-UI.PNG diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png Binary files differnew file mode 100644 index 00000000000..2d08c9f6825 --- /dev/null +++ b/app/assets/images/logo.png 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 |