Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
c3ac7311
Commit
c3ac7311
authored
7 years ago
by
Annabel Dunstone Gray
Committed by
Ruben Davila
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add blue theme
parent
4ccdecb1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
7 deletions
+25
-7
app/assets/stylesheets/framework/gitlab-theme.scss
app/assets/stylesheets/framework/gitlab-theme.scss
+4
-3
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+15
-0
config/gitlab.yml.example
config/gitlab.yml.example
+1
-0
lib/gitlab/themes.rb
lib/gitlab/themes.rb
+2
-1
spec/lib/gitlab/themes_spec.rb
spec/lib/gitlab/themes_spec.rb
+3
-3
No files found.
app/assets/stylesheets/framework/gitlab-theme.scss
View file @
c3ac7311
...
...
@@ -167,9 +167,6 @@
}
body
{
&
.ui_indigo
{
@include
gitlab-theme
(
$indigo-100
,
$indigo-200
,
$indigo-500
,
$indigo-700
,
$indigo-800
,
$indigo-900
);
...
...
@@ -178,4 +175,8 @@ body {
&
.ui_dark
{
@include
gitlab-theme
(
$dark-100
,
$dark-200
,
$dark-500
,
$dark-700
,
$dark-800
,
$dark-900
);
}
&
.ui_blue
{
@include
gitlab-theme
(
$theme-blue-100
,
$theme-blue-200
,
$theme-blue-500
,
$theme-blue-700
,
$theme-blue-800
,
$theme-blue-900
);
}
}
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/variables.scss
View file @
c3ac7311
...
...
@@ -74,6 +74,8 @@ $red-700: #a62d19;
$red-800
:
#8b2615
;
$red-900
:
#711e11
;
// GitLab themes
$indigo-50
:
#f7f7ff
;
$indigo-100
:
#ebebfa
;
$indigo-200
:
#d1d1f0
;
...
...
@@ -98,6 +100,19 @@ $dark-800: #4f4f4f;
$dark-900
:
#2e2e2e
;
$dark-950
:
#1f1f1f
;
$theme-blue-50
:
#f4f8fc
;
$theme-blue-100
:
#e6edf5
;
$theme-blue-200
:
#c8d7e6
;
$theme-blue-300
:
#97b3cf
;
$theme-blue-400
:
#648cb4
;
$theme-blue-500
:
#4a79a8
;
$theme-blue-600
:
#3e6fa0
;
$theme-blue-700
:
#305c88
;
$theme-blue-800
:
#25496e
;
$theme-blue-900
:
#1a3652
;
$theme-blue-950
:
#0f2235
;
$black
:
#000
;
$black-transparent
:
rgba
(
0
,
0
,
0
,
0
.3
);
$almost-black
:
#242424
;
...
...
This diff is collapsed.
Click to expand it.
config/gitlab.yml.example
View file @
c3ac7311
...
...
@@ -79,6 +79,7 @@ production: &base
## Default theme ID
## 1 - Indigo
## 2 - Dark
## 3 - Blue
# default_theme: 1 # default: 1
## Automatic issue closing
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/themes.rb
View file @
c3ac7311
...
...
@@ -13,7 +13,8 @@ module Gitlab
# All available Themes
THEMES
=
[
Theme
.
new
(
1
,
'Indigo'
,
'ui_indigo'
),
Theme
.
new
(
2
,
'Dark'
,
'ui_dark'
)
Theme
.
new
(
2
,
'Dark'
,
'ui_dark'
),
Theme
.
new
(
3
,
'Blue'
,
'ui_blue'
)
].
freeze
# Convenience method to get a space-separated String of all the theme
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/themes_spec.rb
View file @
c3ac7311
...
...
@@ -6,15 +6,15 @@ describe Gitlab::Themes, lib: true do
css
=
described_class
.
body_classes
expect
(
css
).
to
include
(
'ui_indigo'
)
# expect(css).to include(' ui_charcoal
')
#
expect(css).to include(' ui_blue')
expect
(
css
).
to
include
(
' ui_dark
'
)
expect
(
css
).
to
include
(
' ui_blue'
)
end
end
describe
'.by_id'
do
it
'returns a Theme by its ID'
do
expect
(
described_class
.
by_id
(
1
).
name
).
to
eq
'Indigo'
# expect(described_class.by_id(6
).name).to eq 'Blue'
expect
(
described_class
.
by_id
(
3
).
name
).
to
eq
'Blue'
end
end
...
...
This diff is collapsed.
Click to expand it.
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