Add theme type css class
This commit is contained in:
parent
be206a5142
commit
f06f69b9da
|
@ -114,6 +114,10 @@ module ApplicationHelper
|
||||||
Gitlab::Theme.css_class_by_id(current_user.try(:theme_id))
|
Gitlab::Theme.css_class_by_id(current_user.try(:theme_id))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def theme_type
|
||||||
|
Gitlab::Theme.type_css_class_by_id(current_user.try(:theme_id))
|
||||||
|
end
|
||||||
|
|
||||||
def user_color_scheme_class
|
def user_color_scheme_class
|
||||||
COLOR_SCHEMES[current_user.try(:color_scheme_id)] if defined?(current_user)
|
COLOR_SCHEMES[current_user.try(:color_scheme_id)] if defined?(current_user)
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: "Admin area"
|
= render "layouts/head", title: "Admin area"
|
||||||
%body{class: "#{app_theme} admin", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} admin", :'data-page' => body_data_page}
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/head_panel", title: "Admin area"
|
= render "layouts/head_panel", title: "Admin area"
|
||||||
%nav.main-nav.navbar-collapse.collapse
|
%nav.main-nav.navbar-collapse.collapse
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: "Dashboard"
|
= render "layouts/head", title: "Dashboard"
|
||||||
%body{class: "#{app_theme} application", :'data-page' => body_data_page }
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page }
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/head_panel", title: "Dashboard"
|
= render "layouts/head_panel", title: "Dashboard"
|
||||||
%nav.main-nav.navbar-collapse.collapse
|
%nav.main-nav.navbar-collapse.collapse
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: "Error"
|
= render "layouts/head", title: "Error"
|
||||||
%body{class: "#{app_theme} application"}
|
%body{class: "#{app_theme} #{theme_type} application"}
|
||||||
= render "layouts/head_panel", title: "" if current_user
|
= render "layouts/head_panel", title: "" if current_user
|
||||||
.container.navless-container
|
.container.navless-container
|
||||||
= render "layouts/flash"
|
= render "layouts/flash"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: page_title
|
= render "layouts/head", title: page_title
|
||||||
%body{class: "#{app_theme} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
- if current_user
|
- if current_user
|
||||||
= render "layouts/head_panel", title: page_title
|
= render "layouts/head_panel", title: page_title
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: group_head_title
|
= render "layouts/head", title: group_head_title
|
||||||
%body{class: "#{app_theme} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/head_panel", title: "group: #{@group.name}"
|
= render "layouts/head_panel", title: "group: #{@group.name}"
|
||||||
%nav.main-nav.navbar-collapse.collapse
|
%nav.main-nav.navbar-collapse.collapse
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: @title
|
= render "layouts/head", title: @title
|
||||||
%body{class: "#{app_theme} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/head_panel", title: @title
|
= render "layouts/head_panel", title: @title
|
||||||
.container.navless-container
|
.container.navless-container
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: "Profile"
|
= render "layouts/head", title: "Profile"
|
||||||
%body{class: "#{app_theme} profile", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} profile", :'data-page' => body_data_page}
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/head_panel", title: "Profile"
|
= render "layouts/head_panel", title: "Profile"
|
||||||
%nav.main-nav.navbar-collapse.collapse
|
%nav.main-nav.navbar-collapse.collapse
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: @project.name_with_namespace
|
= render "layouts/head", title: @project.name_with_namespace
|
||||||
%body{class: "#{app_theme} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
|
%body{class: "#{app_theme} #{theme_type} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/head_panel", title: project_title(@project)
|
= render "layouts/head_panel", title: project_title(@project)
|
||||||
= render "layouts/init_auto_complete"
|
= render "layouts/init_auto_complete"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: project_head_title
|
= render "layouts/head", title: project_head_title
|
||||||
%body{class: "#{app_theme} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
|
%body{class: "#{app_theme} #{theme_type} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/head_panel", title: project_title(@project)
|
= render "layouts/head_panel", title: project_title(@project)
|
||||||
= render "layouts/init_auto_complete"
|
= render "layouts/init_auto_complete"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: group_head_title
|
= render "layouts/head", title: group_head_title
|
||||||
%body{class: "#{app_theme} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/public_head_panel", title: "group: #{@group.name}"
|
= render "layouts/public_head_panel", title: "group: #{@group.name}"
|
||||||
%nav.main-nav.navbar-collapse.collapse
|
%nav.main-nav.navbar-collapse.collapse
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: @project.name_with_namespace
|
= render "layouts/head", title: @project.name_with_namespace
|
||||||
%body{class: "#{app_theme} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/public_head_panel", title: project_title(@project)
|
= render "layouts/public_head_panel", title: project_title(@project)
|
||||||
%nav.main-nav.navbar-collapse.collapse
|
%nav.main-nav.navbar-collapse.collapse
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: @title
|
= render "layouts/head", title: @title
|
||||||
%body{class: "#{app_theme} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/public_head_panel", title: @title
|
= render "layouts/public_head_panel", title: @title
|
||||||
.container.navless-container
|
.container.navless-container
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!! 5
|
!!! 5
|
||||||
%html{ lang: "en"}
|
%html{ lang: "en"}
|
||||||
= render "layouts/head", title: "Search"
|
= render "layouts/head", title: "Search"
|
||||||
%body{class: "#{app_theme} application", :'data-page' => body_data_page}
|
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
= render "layouts/head_panel", title: "Search"
|
= render "layouts/head_panel", title: "Search"
|
||||||
.container.navless-container
|
.container.navless-container
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// Remove body class for any previous theme, re-add current one
|
// Remove body class for any previous theme, re-add current one
|
||||||
$('body').removeClass('ui_basic ui_mars ui_modern ui_gray ui_color')
|
$('body').removeClass('ui_basic ui_mars ui_modern ui_gray ui_color light_theme dark_theme')
|
||||||
$('body').addClass('<%= app_theme %>')
|
$('body').addClass('<%= app_theme %> <%= theme_type %>')
|
||||||
|
|
||||||
// Re-render the header to reflect the new theme
|
// Re-render the header to reflect the new theme
|
||||||
$('header').html('<%= escape_javascript(render("layouts/head_panel", title: "Profile")) %>')
|
$('header').html('<%= escape_javascript(render("layouts/head_panel", title: "Profile")) %>')
|
||||||
|
|
|
@ -19,5 +19,19 @@ module Gitlab
|
||||||
|
|
||||||
return themes[id]
|
return themes[id]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.type_css_class_by_id(id)
|
||||||
|
types = {
|
||||||
|
BASIC => 'light_theme',
|
||||||
|
MARS => 'dark_theme',
|
||||||
|
MODERN => 'dark_theme',
|
||||||
|
GRAY => 'dark_theme',
|
||||||
|
COLOR => 'dark_theme'
|
||||||
|
}
|
||||||
|
|
||||||
|
id ||= Gitlab.config.gitlab.default_theme
|
||||||
|
|
||||||
|
types[id]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue