diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-24 22:58:47 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-24 22:58:47 -0800 |
commit | 6e559be6c68b921e12518816a824724564e3e315 (patch) | |
tree | 31766bf49c11f2a65db76e44ff245e15141532fc /app/assets | |
parent | 1faf3676aa023395c468d4e89224726c8e5b9b7d (diff) | |
download | gitlab-ce-6e559be6c68b921e12518816a824724564e3e315.tar.gz |
Refactor header logo and setup expectation on it size
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/images/logo-black.png | bin | 2608 -> 3897 bytes | |||
-rw-r--r-- | app/assets/images/logo-white.png | bin | 7331 -> 7699 bytes | |||
-rw-r--r-- | app/assets/stylesheets/sections/header.scss | 20 | ||||
-rw-r--r-- | app/assets/stylesheets/themes/dark-theme.scss | 6 |
4 files changed, 8 insertions, 18 deletions
diff --git a/app/assets/images/logo-black.png b/app/assets/images/logo-black.png Binary files differindex 49cdc16cacd..a58645ed7b0 100644 --- a/app/assets/images/logo-black.png +++ b/app/assets/images/logo-black.png diff --git a/app/assets/images/logo-white.png b/app/assets/images/logo-white.png Binary files differindex 2299153caba..917bcfcb7e7 100644 --- a/app/assets/images/logo-white.png +++ b/app/assets/images/logo-white.png diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index 28fbe03ee75..26b4d04106e 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -100,18 +100,14 @@ header { a { float: left; - padding: 0px; - margin: 0 6px; - - h1 { - margin: 0; - background: image-url('logo-black.png') no-repeat center center; - background-size: 32px; - float: left; - height: 46px; - width: 40px; - @include header-font; - text-indent: -9999px; + padding: 5px 0; + height: 46px; + width: 52px; + text-align: center; + + img { + width: 36px; + height: 36px; } } &:hover { diff --git a/app/assets/stylesheets/themes/dark-theme.scss b/app/assets/stylesheets/themes/dark-theme.scss index abb1ba6686d..b7b22a8724e 100644 --- a/app/assets/stylesheets/themes/dark-theme.scss +++ b/app/assets/stylesheets/themes/dark-theme.scss @@ -12,12 +12,6 @@ &:hover { background-color: $color-darker; } - - h1 { - background: image-url('logo-white.png') no-repeat center center; - background-size: 32px; - color: #FFF; - } } .app_logo { |