Commit 3ec3f085 authored by Paul Slaughter's avatar Paul Slaughter

Merge branch...

Merge branch '358335-replace-generic-checkbox-with-gitlab-ui-styled-checkbox-in-app-views-profiles-notifications' into 'master'

Migrate checkboxes on user notifications page to be Pajamas compliant

See merge request gitlab-org/gitlab!84843
parents 76c6142c 977e30c8
...@@ -5,6 +5,4 @@ ...@@ -5,6 +5,4 @@
.help-block .help-block
= local_assigns.fetch(:help_text, nil) = local_assigns.fetch(:help_text, nil)
.form-group .form-group
%label{ for: 'user_email_opted_in' } = form.gitlab_ui_checkbox_component :email_opted_in, _('Receive product marketing emails')
= form.check_box :email_opted_in
%span= _('Receive product marketing emails')
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%h5.gl-mt-0 %h5.gl-mt-0
= _('Global notification settings') = _('Global notification settings')
= form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications gl-mt-3' } do |f| = gitlab_ui_form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications gl-mt-3' } do |f|
= render_if_exists 'profiles/notifications/email_settings', form: f = render_if_exists 'profiles/notifications/email_settings', form: f
= label_tag :global_notification_level, "Global notification level", class: "label-bold" = label_tag :global_notification_level, "Global notification level", class: "label-bold"
...@@ -35,10 +35,9 @@ ...@@ -35,10 +35,9 @@
.clearfix .clearfix
= form_for @user, url: profile_notifications_path, method: :put do |f| = gitlab_ui_form_for @user, url: profile_notifications_path, method: :put do |f|
%label{ for: 'user_notified_of_own_activity' } .form-group
= f.check_box :notified_of_own_activity = f.gitlab_ui_checkbox_component :notified_of_own_activity, _('Receive notifications about your own activity')
%span= _('Receive notifications about your own activity')
%hr %hr
%h5 %h5
......
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