diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-28 14:39:25 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-28 14:39:25 +0000 |
commit | fb093e8b2e0057c1a0da541fc228f19507a7d4b8 (patch) | |
tree | 5e7a77c77781af1b32a8034638cd9b586c7bb341 /app/views/profiles/preferences | |
parent | 4f620eb9e73df40007a2b34caf0e64da01f95668 (diff) | |
parent | 974f9fb135dd5ce9897991157f8f8c779043baf6 (diff) | |
download | gitlab-ce-fb093e8b2e0057c1a0da541fc228f19507a7d4b8.tar.gz |
Merge branch 'profile-settings-width' into 'master'
Added limited width to profile settings
Closes #20918
See merge request !12386
Diffstat (limited to 'app/views/profiles/preferences')
-rw-r--r-- | app/views/profiles/preferences/show.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 0b5995415e9..a089aeb2447 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -1,15 +1,16 @@ - page_title 'Preferences' +- @content_class = "limit-container-width" unless fluid_layout = 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-3.profile-settings-sidebar + .col-lg-4.profile-settings-sidebar %h4.prepend-top-0 Syntax highlighting theme %p This setting allows you to customize the appearance of the syntax. = succeed '.' do = link_to 'Learn more', help_page_path('user/profile/preferences', anchor: 'syntax-highlighting-theme'), target: '_blank' - .col-lg-9.syntax-theme + .col-lg-8.syntax-theme - Gitlab::ColorSchemes.each do |scheme| = label_tag do .preview= image_tag "#{scheme.css_class}-scheme-preview.png" @@ -36,14 +37,14 @@ New .col-sm-12 %hr - .col-lg-3.profile-settings-sidebar + .col-lg-4.profile-settings-sidebar %h4.prepend-top-0 Behavior %p This setting allows you to customize the behavior of the system layout and default views. = succeed '.' do = link_to 'Learn more', help_page_path('user/profile/preferences', anchor: 'behavior'), target: '_blank' - .col-lg-9 + .col-lg-8 .form-group = f.label :layout, class: 'label-light' do Layout width |