From 135f103ea0369e2115952b89f85b30d16d017d2b Mon Sep 17 00:00:00 2001
From: Yogi <6395788-yo@users.noreply.gitlab.com>
Date: Mon, 8 Mar 2021 05:01:27 +0000
Subject: [PATCH] Move from btn-success to btn-confirm in shared/labels
directory
---
app/views/shared/labels/_form.html.haml | 6 +++---
app/views/shared/labels/_nav.html.haml | 4 ++--
changelogs/unreleased/yo-btn-confirm-shared-labels.yml | 5 +++++
3 files changed, 10 insertions(+), 5 deletions(-)
create mode 100644 changelogs/unreleased/yo-btn-confirm-shared-labels.yml
diff --git a/app/views/shared/labels/_form.html.haml b/app/views/shared/labels/_form.html.haml
index 2df6c3a6afd0..604aac9237cf 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 6d1d422f2279..a0225e35c903 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 000000000000..c708a454bc12
--- /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
--
GitLab