Commit 5a08cef2 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'restore-navigation-theme-order' into 'master'

Restore navigation theme order

See merge request gitlab-org/gitlab-ce!19521
parents 717a46dd 93c7976a
......@@ -13,15 +13,15 @@ module Themes
# 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
......
......@@ -31,7 +31,7 @@
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
......
......@@ -6,7 +6,7 @@
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 '.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
......
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