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
Jérome Perrin
gitlab-ce
Commits
293eed4d
Commit
293eed4d
authored
Dec 27, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issues/8081' into 'master'
Issues/8081 See merge request !7908
parents
62b22583
23f063e4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
19 deletions
+23
-19
app/assets/stylesheets/framework/gitlab-theme.scss
app/assets/stylesheets/framework/gitlab-theme.scss
+16
-16
app/assets/stylesheets/pages/profiles/preferences.scss
app/assets/stylesheets/pages/profiles/preferences.scss
+2
-2
changelogs/unreleased/issues-8081.yml
changelogs/unreleased/issues-8081.yml
+4
-0
lib/gitlab/themes.rb
lib/gitlab/themes.rb
+1
-1
No files found.
app/assets/stylesheets/framework/gitlab-theme.scss
View file @
293eed4d
...
...
@@ -84,25 +84,25 @@
}
}
$theme-charcoal
:
#3d454d
;
$theme-charcoal
-light
:
#485157
;
$theme-charcoal-dark
:
#3
83f45
;
$theme-charcoal-
text
:
#b9bbbe
;
$theme-charcoal
-light
:
#b9bbbe
;
$theme-charcoal
:
#485157
;
$theme-charcoal-dark
:
#3
d454d
;
$theme-charcoal-
darker
:
#383f45
;
$theme-blue-light
:
#becde9
;
$theme-blue
:
#2980b9
;
$theme-blue-dark
:
#1970a9
;
$theme-blue-darker
:
#096099
;
$theme-graphite-light
er
:
#ccc
;
$theme-graphite
-light
:
#777
;
$theme-graphite
:
#666
;
$theme-graphite-dark
:
#555
;
$theme-graphite-light
:
#ccc
;
$theme-graphite
:
#777
;
$theme-graphite
-dark
:
#666
;
$theme-graphite-dark
er
:
#555
;
$theme-
gray
-light
:
#979797
;
$theme-
gray
:
#373737
;
$theme-
gray
-dark
:
#272727
;
$theme-
gray
-darker
:
#222
;
$theme-
black
-light
:
#979797
;
$theme-
black
:
#373737
;
$theme-
black
-dark
:
#272727
;
$theme-
black
-darker
:
#222
;
$theme-green-light
:
#adc
;
$theme-green
:
#019875
;
...
...
@@ -120,15 +120,15 @@ body {
}
&
.ui_charcoal
{
@include
gitlab-theme
(
$theme-charcoal-
text
,
$theme-charcoal-light
,
$theme-charcoal
,
$theme-charcoal-dark
);
@include
gitlab-theme
(
$theme-charcoal-
light
,
$theme-charcoal
,
$theme-charcoal-dark
,
$theme-charcoal-darker
);
}
&
.ui_graphite
{
@include
gitlab-theme
(
$theme-graphite-light
er
,
$theme-graphite-light
,
$theme-graphite
,
$theme-graphite-dark
);
@include
gitlab-theme
(
$theme-graphite-light
,
$theme-graphite
,
$theme-graphite-dark
,
$theme-graphite-darker
);
}
&
.ui_
gray
{
@include
gitlab-theme
(
$theme-
gray-light
,
$theme-gray
,
$theme-gray-dark
,
$theme-gray
-darker
);
&
.ui_
black
{
@include
gitlab-theme
(
$theme-
black-light
,
$theme-black
,
$theme-black-dark
,
$theme-black
-darker
);
}
&
.ui_green
{
...
...
app/assets/stylesheets/pages/profiles/preferences.scss
View file @
293eed4d
...
...
@@ -22,8 +22,8 @@
background
:
$theme-graphite
;
}
&
.ui_
gray
{
background
:
$theme-
gray
;
&
.ui_
black
{
background
:
$theme-
black
;
}
&
.ui_green
{
...
...
changelogs/unreleased/issues-8081.yml
0 → 100644
View file @
293eed4d
---
title
:
change 'gray' color theme name to 'black' to match the actual color
merge_request
:
7908
author
:
BM5k
lib/gitlab/themes.rb
View file @
293eed4d
...
...
@@ -15,7 +15,7 @@ module Gitlab
Theme
.
new
(
1
,
'Graphite'
,
'ui_graphite'
),
Theme
.
new
(
2
,
'Charcoal'
,
'ui_charcoal'
),
Theme
.
new
(
3
,
'Green'
,
'ui_green'
),
Theme
.
new
(
4
,
'
Gray'
,
'ui_gray
'
),
Theme
.
new
(
4
,
'
Black'
,
'ui_black
'
),
Theme
.
new
(
5
,
'Violet'
,
'ui_violet'
),
Theme
.
new
(
6
,
'Blue'
,
'ui_blue'
)
].
freeze
...
...
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