Commit b321cb55 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'yo-btn-confirm-shared-labels' into 'master'

Move from btn-success to btn-confirm in shared/labels directory

See merge request gitlab-org/gitlab!55304
parents 583b4221 135f103e
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
= render_suggested_colors = render_suggested_colors
.form-actions .form-actions
- if @label.persisted? - 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 - else
= f.submit 'Create label', class: 'btn gl-button btn-success js-save-button qa-label-create-button' = 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-cancel' = link_to 'Cancel', back_path, class: 'btn gl-button btn-default btn-cancel'
...@@ -19,6 +19,6 @@ ...@@ -19,6 +19,6 @@
= sprite_icon('search') = sprite_icon('search')
= render 'shared/labels/sort_dropdown' = render 'shared/labels/sort_dropdown'
- if labels_or_filters && can_admin_label && @project - 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 - 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"
---
title: Move from btn-success to btn-confirm in shared/labels directory
merge_request: 55304
author: Yogi (@yo)
type: changed
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