Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
91f47f882c5e
Commit
59621e90
authored
Mar 12, 2015
by
Dmitriy Zaporozhets
Browse files
Merge branch 'blue-theme' into 'master'
Add blue theme to GitLab See merge request !1682
parents
99ac4cf6bc64
63c661f5491c
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/pages/profile.scss
View file @
91f47f88
...
...
@@ -80,6 +80,10 @@
&
.violet
{
background
:
#548
;
}
&
.blue
{
background
:
#2980b9
;
}
}
}
}
...
...
app/assets/stylesheets/themes/ui_blue.scss
0 → 100644
View file @
91f47f88
/**
* Modern GitLab UI theme
*/
.ui_blue
{
@include
dark-theme
(
#BECDE9
,
#2980b9
,
#1970a9
,
#096099
);
}
app/views/profiles/design.html.haml
View file @
91f47f88
...
...
@@ -33,6 +33,11 @@
.prev.violet
=
f
.
radio_button
:theme_id
,
5
Violet
=
label_tag
do
.prev.blue
=
f
.
radio_button
:theme_id
,
6
Blue
%br
.clearfix
...
...
lib/gitlab/theme.rb
View file @
91f47f88
...
...
@@ -5,6 +5,7 @@ class Theme
MODERN
=
3
unless
const_defined?
(
:MODERN
)
GRAY
=
4
unless
const_defined?
(
:GRAY
)
COLOR
=
5
unless
const_defined?
(
:COLOR
)
BLUE
=
6
unless
const_defined?
(
:BLUE
)
def
self
.
css_class_by_id
(
id
)
themes
=
{
...
...
@@ -12,7 +13,8 @@ def self.css_class_by_id(id)
MARS
=>
"ui_mars"
,
MODERN
=>
"ui_modern"
,
GRAY
=>
"ui_gray"
,
COLOR
=>
"ui_color"
COLOR
=>
"ui_color"
,
BLUE
=>
"ui_blue"
}
id
||=
Gitlab
.
config
.
gitlab
.
default_theme
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment