diff --git a/app/views/shared/labels/_form.html.haml b/app/views/shared/labels/_form.html.haml index 2df6c3a6afd014d429727dbe19deb8a429b80b05..604aac9237cf00598a31c660bb675aef52a27e41 100644 --- a/app/views/shared/labels/_form.html.haml +++ b/app/views/shared/labels/_form.html.haml @@ -28,7 +28,7 @@ = render_suggested_colors .form-actions - if @label.persisted? - = f.submit 'Save changes', class: 'btn gl-button btn-success js-save-button' + = f.submit 'Save changes', class: 'btn gl-button btn-confirm js-save-button' - else - = f.submit 'Create label', class: 'btn gl-button btn-success js-save-button qa-label-create-button' - = link_to 'Cancel', back_path, class: 'btn gl-button btn-cancel' + = f.submit 'Create label', class: 'btn gl-button btn-confirm js-save-button qa-label-create-button' + = link_to 'Cancel', back_path, class: 'btn gl-button btn-default btn-cancel' diff --git a/app/views/shared/labels/_nav.html.haml b/app/views/shared/labels/_nav.html.haml index 6d1d422f2279c4805edaa6e8057b0a22902aa44b..a0225e35c903fea96f2a51e73e4aa8547afaa080 100644 --- a/app/views/shared/labels/_nav.html.haml +++ b/app/views/shared/labels/_nav.html.haml @@ -19,6 +19,6 @@ = sprite_icon('search') = render 'shared/labels/sort_dropdown' - if labels_or_filters && can_admin_label && @project - = link_to _('New label'), new_project_label_path(@project), class: "btn gl-button btn-success qa-label-create-new" + = link_to _('New label'), new_project_label_path(@project), class: "btn gl-button btn-confirm qa-label-create-new" - if labels_or_filters && can_admin_label && @group - = link_to _('New label'), new_group_label_path(@group), class: "btn gl-button btn-success qa-label-create-new" + = link_to _('New label'), new_group_label_path(@group), class: "btn gl-button btn-confirm qa-label-create-new" diff --git a/changelogs/unreleased/yo-btn-confirm-shared-labels.yml b/changelogs/unreleased/yo-btn-confirm-shared-labels.yml new file mode 100644 index 0000000000000000000000000000000000000000..c708a454bc123c431a0e08aca2fddd8e35c1390f --- /dev/null +++ b/changelogs/unreleased/yo-btn-confirm-shared-labels.yml @@ -0,0 +1,5 @@ +--- +title: Move from btn-success to btn-confirm in shared/labels directory +merge_request: 55304 +author: Yogi (@yo) +type: changed