diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-21 16:35:11 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-21 16:35:11 +0300 |
commit | 6e6df3b830092f093f87e91b7910ee4c50af9f80 (patch) | |
tree | 238ac0813c343d804a41945edc110caefb67357e /app/assets/stylesheets/themes | |
parent | d3059c7d29b14006cf2684e6d5d489aa5f6de8fe (diff) |
Refactor themes for new UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets/themes')
-rw-r--r-- | app/assets/stylesheets/themes/gitlab-theme.scss (renamed from app/assets/stylesheets/themes/dark-theme.scss) | 31 | ||||
-rw-r--r-- | app/assets/stylesheets/themes/ui_basic.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/themes/ui_blue.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/themes/ui_color.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/themes/ui_gray.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/themes/ui_mars.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/themes/ui_modern.scss | 2 |
7 files changed, 7 insertions, 41 deletions
diff --git a/app/assets/stylesheets/themes/dark-theme.scss b/app/assets/stylesheets/themes/gitlab-theme.scss index c3502cb46fc..929c4fa9c30 100644 --- a/app/assets/stylesheets/themes/dark-theme.scss +++ b/app/assets/stylesheets/themes/gitlab-theme.scss @@ -1,4 +1,4 @@ -@mixin dark-theme($color-light, $color, $color-darker, $color-dark) { +@mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) { header { &.navbar-gitlab { .navbar-inner { @@ -19,35 +19,6 @@ } } } - - .app_logo { - @media (max-width: $screen-md-max) { - width: 52px; - h3 { - display: none; - } - } - border-bottom: 1px solid transparent; - margin-bottom: -1px; - - a { - padding: 5px 8px; - - img { - float: left; - } - - h3 { - width: 158px; - float: left; - margin: 0; - margin-left: 20px; - font-size: 18px; - line-height: 34px; - font-weight: normal; - } - } - } } } } diff --git a/app/assets/stylesheets/themes/ui_basic.scss b/app/assets/stylesheets/themes/ui_basic.scss index 03d98b00d49..63e8dce1e92 100644 --- a/app/assets/stylesheets/themes/ui_basic.scss +++ b/app/assets/stylesheets/themes/ui_basic.scss @@ -4,10 +4,5 @@ * */ .ui_basic { - header { - &.navbar-gitlab { - .navbar-inner { - } - } - } + @include gitlab-theme(#CCCCCC, #888888, #777777, #666666); } diff --git a/app/assets/stylesheets/themes/ui_blue.scss b/app/assets/stylesheets/themes/ui_blue.scss index e223058be8b..cf995622b6b 100644 --- a/app/assets/stylesheets/themes/ui_blue.scss +++ b/app/assets/stylesheets/themes/ui_blue.scss @@ -2,5 +2,5 @@ * Blue GitLab UI theme */ .ui_blue { - @include dark-theme(#BECDE9, #2980b9, #1970a9, #096099); + @include gitlab-theme(#BECDE9, #2980b9, #1970a9, #096099); } diff --git a/app/assets/stylesheets/themes/ui_color.scss b/app/assets/stylesheets/themes/ui_color.scss index 7ac6903b2e4..6babccec0da 100644 --- a/app/assets/stylesheets/themes/ui_color.scss +++ b/app/assets/stylesheets/themes/ui_color.scss @@ -2,5 +2,5 @@ * Violet GitLab UI theme */ .ui_color { - @include dark-theme(#98C, #548, #436, #325); + @include gitlab-theme(#98C, #548, #436, #325); } diff --git a/app/assets/stylesheets/themes/ui_gray.scss b/app/assets/stylesheets/themes/ui_gray.scss index 9257e5f4d40..f8e4a6ea7da 100644 --- a/app/assets/stylesheets/themes/ui_gray.scss +++ b/app/assets/stylesheets/themes/ui_gray.scss @@ -2,5 +2,5 @@ * Gray GitLab UI theme */ .ui_gray { - @include dark-theme(#979797, #373737, #272727, #222222); + @include gitlab-theme(#979797, #373737, #272727, #222222); } diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss index 4caf5843d9b..fda96b64cd9 100644 --- a/app/assets/stylesheets/themes/ui_mars.scss +++ b/app/assets/stylesheets/themes/ui_mars.scss @@ -2,5 +2,5 @@ * Classic GitLab UI theme */ .ui_mars { - @include dark-theme(#979DA7, #474D57, #373D47, #24272D); + @include gitlab-theme(#979DA7, #474D57, #373D47, #24272D); } diff --git a/app/assets/stylesheets/themes/ui_modern.scss b/app/assets/stylesheets/themes/ui_modern.scss index 70449882317..8261e80b35f 100644 --- a/app/assets/stylesheets/themes/ui_modern.scss +++ b/app/assets/stylesheets/themes/ui_modern.scss @@ -2,5 +2,5 @@ * Modern GitLab UI theme */ .ui_modern { - @include dark-theme(#ADC, #019875, #018865, #017855); + @include gitlab-theme(#ADC, #019875, #018865, #017855); } |