From 4c6c24856cc326e26b6f7ac91ee6eae9fcc722f7 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 21 Nov 2012 07:14:05 +0300 Subject: [PATCH] Themes refactored --- app/assets/images/gitlab_classic.png | Bin 3054 -> 0 bytes app/assets/images/gitlab_default.png | Bin 6435 -> 0 bytes app/assets/images/gitlab_modern.png | Bin 3892 -> 0 bytes app/assets/images/logo_dark.png | Bin 2858 -> 2589 bytes app/assets/images/logo_white.png | Bin 1681 -> 1517 bytes app/assets/stylesheets/common.scss | 19 -------- app/assets/stylesheets/main.scss | 9 ++-- app/assets/stylesheets/sections/header.scss | 10 ++-- app/assets/stylesheets/sections/themes.scss | 53 +++++++++++++++++++++ app/assets/stylesheets/themes/ui_color.scss | 68 +++++++++++++++++++++++++++ app/assets/stylesheets/themes/ui_gray.scss | 68 +++++++++++++++++++++++++++ app/assets/stylesheets/themes/ui_mars.scss | 2 +- app/assets/stylesheets/themes/ui_modern.scss | 14 +++--- app/views/profile/design.html.haml | 21 ++++++--- lib/gitlab/theme.rb | 6 ++- 15 files changed, 224 insertions(+), 46 deletions(-) delete mode 100644 app/assets/images/gitlab_classic.png delete mode 100644 app/assets/images/gitlab_default.png delete mode 100644 app/assets/images/gitlab_modern.png create mode 100644 app/assets/stylesheets/sections/themes.scss create mode 100644 app/assets/stylesheets/themes/ui_color.scss create mode 100644 app/assets/stylesheets/themes/ui_gray.scss diff --git a/app/assets/images/gitlab_classic.png b/app/assets/images/gitlab_classic.png deleted file mode 100644 index 4e189e220abb3d6e08f067802f95cdbe862853bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3054 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 diff --git a/app/assets/images/gitlab_modern.png b/app/assets/images/gitlab_modern.png deleted file mode 100644 index b2d73b7a789f048a9947d68a0b942abe57c0b2e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3892 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 RBN_kz002ovPDHLkV1nvM=U4y$ delta 2826 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 diff --git a/app/assets/images/logo_white.png b/app/assets/images/logo_white.png index 3f74025449c2e1a3aa4af6052098366e89ae90c2..366e3f3f3b9f16a15f43a7f3fdd04aa2470a177f 100644 GIT binary patch delta 1488 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 diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index aeaddb0b4..e45cb876e 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -584,25 +584,6 @@ li.note { } } -.themes_opts { - padding-left:20px; - - label { - width:175px; - margin-right:40px; - - .prev { - @extend .thumbnail; - height:120px; - width:175px; - margin-bottom:10px; - img { - width:180px; - } - } - } -} - .git_error_tips { @extend .span6; text-align:left; diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 099d50437..7ae32b3a7 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -118,14 +118,12 @@ $monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono' @import "themes/ui_basic.scss"; /** - * UI mars theme + * UI themes: */ @import "themes/ui_mars.scss"; - -/** - * UI Modern theme - */ @import "themes/ui_modern.scss"; +@import "themes/ui_gray.scss"; +@import "themes/ui_color.scss"; /** * GitLab bootstrap. @@ -159,6 +157,7 @@ $monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono' @import "sections/merge_requests.scss"; @import "sections/graph.scss"; @import "sections/events.scss"; +@import "sections/themes.scss"; /** * This scss file redefine chozen selectbox styles for diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index 90a57363a..32f6d8552 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -39,15 +39,15 @@ header { h1 { width:90px; - background: url('logo_dark.png') no-repeat 0px -3px; + background: url('logo_dark.png') no-repeat 0px 2px; float:left; - margin-left:5px; + margin-left:2px; font-size:30px; line-height:48px; font-weight:normal; color:$style_color; text-shadow: 0 1px 1px #FFF; - padding-left:50px; + padding-left:45px; height:40px; font-family: 'Korolev', sans-serif; } @@ -98,7 +98,7 @@ header { background-position: 10px; padding-left:25px; font-size: 13px; - @include border-radius(2px); + @include border-radius(3px); border:1px solid #c6c6c6; box-shadow:none; &:focus { @@ -123,7 +123,7 @@ header { display: block; cursor: pointer; img { - @include border-radius(2px); + @include border-radius(3px); right: 5px; position: absolute; width: 28px; diff --git a/app/assets/stylesheets/sections/themes.scss b/app/assets/stylesheets/sections/themes.scss new file mode 100644 index 000000000..62dd27d07 --- /dev/null +++ b/app/assets/stylesheets/sections/themes.scss @@ -0,0 +1,53 @@ +.themes_opts { + padding-left:20px; + + label { + width:175px; + margin-right:40px; + + .prev { + @extend .thumbnail; + height:30px; + width:175px; + margin-bottom:10px; + + &.classic { + background: #31363e; + } + + &.default { + background: #f1f1f1; + } + + &.modern { + background: #567; + } + + &.gray { + background: #708090; + } + + &.violet { + background: #657; + } + } + } +} + +.code_highlight_opts { + padding-left:20px; + + label { + width:220px; + margin-right:40px; + + .prev { + @extend .thumbnail; + height:151px; + width:220px; + margin-bottom:10px; + } + } +} + + diff --git a/app/assets/stylesheets/themes/ui_color.scss b/app/assets/stylesheets/themes/ui_color.scss new file mode 100644 index 000000000..4497892da --- /dev/null +++ b/app/assets/stylesheets/themes/ui_color.scss @@ -0,0 +1,68 @@ +/** + * This file represent some UI that can be changed + * during web app restyle or theme select. + * + * Next items should be placed there + * - link colors + * - header restyles + * + */ +.ui_color { + + /* + * Application Header + * + */ + header { + + &.navbar-gitlab { + .navbar-inner { + background: #657; + border-bottom: 1px solid #AAA; + + .nav > li > a { + color: #fff; + text-shadow: 0 1px 0 #111; + } + } + } + + .search { + float: right; + margin-right: 45px; + .search-input { + border: 1px solid #aaa; + background-color: #D2D5DA; + background-color: rgba(255, 255, 255, 0.5); + + &:focus { + background-color: white; + } + } + } + .search-input::-webkit-input-placeholder { + color: #666; + } + .app_logo { + a { + h1 { + background: url('logo_white.png') no-repeat 0px 2px; + color:#fff; + text-shadow: 0 1px 1px #111; + } + } + .separator { + display:none; + } + + } + .project_name { + color:#fff; + text-shadow: 0 1px 1px #111; + } + } + /* + * End of Application Header + * + */ +} diff --git a/app/assets/stylesheets/themes/ui_gray.scss b/app/assets/stylesheets/themes/ui_gray.scss new file mode 100644 index 000000000..5ee2b0ddf --- /dev/null +++ b/app/assets/stylesheets/themes/ui_gray.scss @@ -0,0 +1,68 @@ +/** + * This file represent some UI that can be changed + * during web app restyle or theme select. + * + * Next items should be placed there + * - link colors + * - header restyles + * + */ +.ui_gray { + + /* + * Application Header + * + */ + header { + + &.navbar-gitlab { + .navbar-inner { + background: #708090; + border-bottom: 1px solid #AAA; + + .nav > li > a { + color: #fff; + text-shadow: 0 1px 0 #111; + } + } + } + + .search { + float: right; + margin-right: 45px; + .search-input { + border: 1px solid #aaa; + background-color: #D2D5DA; + background-color: rgba(255, 255, 255, 0.5); + + &:focus { + background-color: white; + } + } + } + .search-input::-webkit-input-placeholder { + color: #666; + } + .app_logo { + a { + h1 { + background: url('logo_white.png') no-repeat 0px 2px; + color:#fff; + text-shadow: 0 1px 1px #111; + } + } + .separator { + display:none; + } + + } + .project_name { + color:#fff; + text-shadow: 0 1px 1px #111; + } + } + /* + * End of Application Header + * + */ +} diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss index 3773e61cc..a9d212413 100644 --- a/app/assets/stylesheets/themes/ui_mars.scss +++ b/app/assets/stylesheets/themes/ui_mars.scss @@ -46,7 +46,7 @@ .app_logo { a { h1 { - background: url('logo_white.png') no-repeat 0px -3px; + background: url('logo_white.png') no-repeat 0px 2px; color:#eee; text-shadow: 0 1px 1px #111; } diff --git a/app/assets/stylesheets/themes/ui_modern.scss b/app/assets/stylesheets/themes/ui_modern.scss index 73445ec60..0bb14cdd7 100644 --- a/app/assets/stylesheets/themes/ui_modern.scss +++ b/app/assets/stylesheets/themes/ui_modern.scss @@ -17,11 +17,11 @@ &.navbar-gitlab { .navbar-inner { - background: #333; - border-bottom: 1px solid #111; + background: #567; + border-bottom: 1px solid #AAA; .nav > li > a { - color: #eee; + color: #fff; text-shadow: 0 1px 0 #111; } } @@ -31,7 +31,7 @@ float: right; margin-right: 45px; .search-input { - border: 1px solid rgba(0, 0, 0, 0.7); + border: 1px solid #aaa; background-color: #D2D5DA; background-color: rgba(255, 255, 255, 0.5); @@ -46,8 +46,8 @@ .app_logo { a { h1 { - background: url('logo_white.png') no-repeat 0px -3px; - color:#eee; + background: url('logo_white.png') no-repeat 0px 2px; + color:#fff; text-shadow: 0 1px 1px #111; } } @@ -57,7 +57,7 @@ } .project_name { - color:#eee; + color:#fff; text-shadow: 0 1px 1px #111; } } diff --git a/app/views/profile/design.html.haml b/app/views/profile/design.html.haml index 4eace607e..5099ea5d6 100644 --- a/app/views/profile/design.html.haml +++ b/app/views/profile/design.html.haml @@ -3,28 +3,35 @@ %legend Application theme .themes_opts = label_tag do - .prev - = image_tag "gitlab_default.png" + .prev.default = f.radio_button :theme_id, 1 Default = label_tag do - .prev - = image_tag "gitlab_classic.png" + .prev.classic = f.radio_button :theme_id, 2 Classic = label_tag do - .prev - = image_tag "gitlab_modern.png" + .prev.modern = f.radio_button :theme_id, 3 Modern + + = label_tag do + .prev.gray + = f.radio_button :theme_id, 4 + SlateGray + + = label_tag do + .prev.violet + = f.radio_button :theme_id, 5 + Violet %br .clearfix %fieldset %legend Code review - .themes_opts + .code_highlight_opts = label_tag do .prev = image_tag "white.png" diff --git a/lib/gitlab/theme.rb b/lib/gitlab/theme.rb index 6e2be7650..7f833867e 100644 --- a/lib/gitlab/theme.rb +++ b/lib/gitlab/theme.rb @@ -1,10 +1,12 @@ module Gitlab class Theme def self.css_class_by_id(id) - themes = { + themes = { 1 => "ui_basic", 2 => "ui_mars", - 3 => "ui_modern" + 3 => "ui_modern", + 4 => "ui_gray", + 5 => "ui_color" } id ||= 1 -- 2.11.0