Commit 59621e90 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'blue-theme' into 'master'

Add blue theme to GitLab

See merge request !1682
parents 5d27b23d 158507d9
...@@ -80,6 +80,10 @@ ...@@ -80,6 +80,10 @@
&.violet { &.violet {
background: #548; background: #548;
} }
&.blue {
background: #2980b9;
}
} }
} }
} }
......
/**
* Modern GitLab UI theme
*/
.ui_blue {
@include dark-theme(#BECDE9, #2980b9, #1970a9, #096099);
}
...@@ -33,6 +33,11 @@ ...@@ -33,6 +33,11 @@
.prev.violet .prev.violet
= f.radio_button :theme_id, 5 = f.radio_button :theme_id, 5
Violet Violet
= label_tag do
.prev.blue
= f.radio_button :theme_id, 6
Blue
%br %br
.clearfix .clearfix
......
...@@ -5,6 +5,7 @@ module Gitlab ...@@ -5,6 +5,7 @@ module Gitlab
MODERN = 3 unless const_defined?(:MODERN) MODERN = 3 unless const_defined?(:MODERN)
GRAY = 4 unless const_defined?(:GRAY) GRAY = 4 unless const_defined?(:GRAY)
COLOR = 5 unless const_defined?(:COLOR) COLOR = 5 unless const_defined?(:COLOR)
BLUE = 6 unless const_defined?(:BLUE)
def self.css_class_by_id(id) def self.css_class_by_id(id)
themes = { themes = {
...@@ -12,7 +13,8 @@ module Gitlab ...@@ -12,7 +13,8 @@ module Gitlab
MARS => "ui_mars", MARS => "ui_mars",
MODERN => "ui_modern", MODERN => "ui_modern",
GRAY => "ui_gray", GRAY => "ui_gray",
COLOR => "ui_color" COLOR => "ui_color",
BLUE => "ui_blue"
} }
id ||= Gitlab.config.gitlab.default_theme id ||= Gitlab.config.gitlab.default_theme
......
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