Commit 6e559be6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Refactor header logo and setup expectation on it size

parent 1faf3676
app/assets/images/logo-black.png

2.55 KB | W: | H:

app/assets/images/logo-black.png

3.81 KB | W: | H:

app/assets/images/logo-black.png
app/assets/images/logo-black.png
app/assets/images/logo-black.png
app/assets/images/logo-black.png
  • 2-up
  • Swipe
  • Onion skin
app/assets/images/logo-white.png

7.16 KB | W: | H:

app/assets/images/logo-white.png

7.52 KB | W: | H:

app/assets/images/logo-white.png
app/assets/images/logo-white.png
app/assets/images/logo-white.png
app/assets/images/logo-white.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -100,18 +100,14 @@ header { ...@@ -100,18 +100,14 @@ header {
a { a {
float: left; float: left;
padding: 0px; padding: 5px 0;
margin: 0 6px;
h1 {
margin: 0;
background: image-url('logo-black.png') no-repeat center center;
background-size: 32px;
float: left;
height: 46px; height: 46px;
width: 40px; width: 52px;
@include header-font; text-align: center;
text-indent: -9999px;
img {
width: 36px;
height: 36px;
} }
} }
&:hover { &:hover {
......
...@@ -12,12 +12,6 @@ ...@@ -12,12 +12,6 @@
&:hover { &:hover {
background-color: $color-darker; background-color: $color-darker;
} }
h1 {
background: image-url('logo-white.png') no-repeat center center;
background-size: 32px;
color: #FFF;
}
} }
.app_logo { .app_logo {
......
...@@ -14,4 +14,12 @@ module AppearancesHelper ...@@ -14,4 +14,12 @@ module AppearancesHelper
def brand_text def brand_text
nil nil
end end
def brand_header_logo
if theme_type == 'light_theme'
image_tag 'logo-black.png'
else
image_tag 'logo-white.png'
end
end
end end
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.container .container
%div.app_logo %div.app_logo
= link_to root_path, class: "home has_bottom_tooltip", title: "Dashboard" do = link_to root_path, class: "home has_bottom_tooltip", title: "Dashboard" do
%h1 GITLAB = brand_header_logo
%h1.title= title %h1.title= title
%button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"} %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
......
...@@ -2,10 +2,8 @@ ...@@ -2,10 +2,8 @@
.navbar-inner .navbar-inner
.container .container
%div.app_logo %div.app_logo
%span.separator
= link_to explore_root_path, class: "home" do = link_to explore_root_path, class: "home" do
%h1 GITLAB = brand_header_logo
%span.separator
%h1.title= title %h1.title= title
%button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"} %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment