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
Léo-Paul Géneau
gitlab-ce
Commits
93c7976a
Commit
93c7976a
authored
Jun 07, 2018
by
George Tsiolis
Committed by
Phil Hughes
Jun 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restore navigation theme order
parent
717a46dd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
lib/gitlab/themes.rb
lib/gitlab/themes.rb
+8
-8
spec/helpers/preferences_helper_spec.rb
spec/helpers/preferences_helper_spec.rb
+1
-1
spec/lib/gitlab/themes_spec.rb
spec/lib/gitlab/themes_spec.rb
+2
-2
No files found.
lib/gitlab/themes.rb
View file @
93c7976a
...
...
@@ -13,15 +13,15 @@ module Gitlab
# All available Themes
THEMES
=
[
Theme
.
new
(
1
,
'Indigo'
,
'ui-indigo'
),
Theme
.
new
(
2
,
'Light Indigo'
,
'ui-light-indigo'
),
Theme
.
new
(
3
,
'Blue'
,
'ui-blue'
),
Theme
.
new
(
4
,
'Light Blue'
,
'ui-light-blue'
),
Theme
.
new
(
6
,
'Light Indigo'
,
'ui-light-indigo'
),
Theme
.
new
(
4
,
'Blue'
,
'ui-blue'
),
Theme
.
new
(
7
,
'Light Blue'
,
'ui-light-blue'
),
Theme
.
new
(
5
,
'Green'
,
'ui-green'
),
Theme
.
new
(
6
,
'Light Green'
,
'ui-light-green'
),
Theme
.
new
(
7
,
'Red'
,
'ui-red'
),
Theme
.
new
(
8
,
'Light Red'
,
'ui-light-red'
),
Theme
.
new
(
9
,
'Dark'
,
'ui-dark'
),
Theme
.
new
(
10
,
'Light'
,
'ui-light'
)
Theme
.
new
(
8
,
'Light Green'
,
'ui-light-green'
),
Theme
.
new
(
9
,
'Red'
,
'ui-red'
),
Theme
.
new
(
10
,
'Light Red'
,
'ui-light-red'
),
Theme
.
new
(
2
,
'Dark'
,
'ui-dark'
),
Theme
.
new
(
3
,
'Light'
,
'ui-light'
)
].
freeze
# Convenience method to get a space-separated String of all the theme
...
...
spec/helpers/preferences_helper_spec.rb
View file @
93c7976a
...
...
@@ -31,7 +31,7 @@ describe PreferencesHelper do
describe
'#user_application_theme'
do
context
'with a user'
do
it
"returns user's theme's css_class"
do
stub_user
(
theme_id:
10
)
stub_user
(
theme_id:
3
)
expect
(
helper
.
user_application_theme
).
to
eq
'ui-light'
end
...
...
spec/lib/gitlab/themes_spec.rb
View file @
93c7976a
...
...
@@ -6,7 +6,7 @@ describe Gitlab::Themes, lib: true do
css
=
described_class
.
body_classes
expect
(
css
).
to
include
(
'ui-indigo'
)
expect
(
css
).
to
include
(
'ui-dark
'
)
expect
(
css
).
to
include
(
'ui-dark'
)
expect
(
css
).
to
include
(
'ui-blue'
)
end
end
...
...
@@ -14,7 +14,7 @@ describe Gitlab::Themes, lib: true do
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
(
10
).
name
).
to
eq
'Light'
expect
(
described_class
.
by_id
(
3
).
name
).
to
eq
'Light'
end
end
...
...
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