diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-31 15:08:30 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-09-06 12:54:09 -0500 |
| commit | 3c815f97d32d78abc0eea4f0dd2397e646cd9fd6 (patch) | |
| tree | ffd48acc78844cdbad32ea1da38538d4c6e6cae8 /app/views/profiles | |
| parent | 6c49a628000605d1beb120431003abb329b9fd16 (diff) | |
| download | gitlab-ce-3c815f97d32d78abc0eea4f0dd2397e646cd9fd6.tar.gz | |
Add functionality for two themes
Diffstat (limited to 'app/views/profiles')
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 13 | ||||
| -rw-r--r-- | app/views/profiles/preferences/update.js.erb | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 9e7fe556d88..9787a567b4d 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -3,6 +3,19 @@ = render 'profiles/head' = form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f| + .col-lg-4.application-theme + %h4.prepend-top-0 + GitLab theme + .col-lg-8.application-theme + - Gitlab::Themes.each do |theme| + = label_tag do + .preview{ class: theme.css_class } + = f.radio_button :theme_id, theme.id + = theme.name + + .col-sm-12 + %hr + .col-lg-4.profile-settings-sidebar %h4.prepend-top-0 Syntax highlighting theme diff --git a/app/views/profiles/preferences/update.js.erb b/app/views/profiles/preferences/update.js.erb index 431ab9d052b..8966dd3fd86 100644 --- a/app/views/profiles/preferences/update.js.erb +++ b/app/views/profiles/preferences/update.js.erb @@ -1,3 +1,7 @@ +// Remove body class for any previous theme, re-add current one +$('body').removeClass('<%= Gitlab::Themes.body_classes %>') +$('body').addClass('<%= user_application_theme %>') + // Toggle container-fluid class if ('<%= current_user.layout %>' === 'fluid') { $('.content-wrapper .container-fluid').removeClass('container-limited') |