Commit d953db44 authored by Scott Hampton's avatar Scott Hampton

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

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

See merge request gitlab-org/gitlab!55303
parents 41ccce7f 0169b491
...@@ -72,9 +72,9 @@ ...@@ -72,9 +72,9 @@
%span.gl-mr-3 %span.gl-mr-3
- if issuable.new_record? - if issuable.new_record?
= form.submit "Submit #{issuable.class.model_name.human.downcase}", class: 'gl-button btn btn-success qa-issuable-create-button' = form.submit "Submit #{issuable.class.model_name.human.downcase}", class: 'gl-button btn btn-confirm qa-issuable-create-button'
- else - else
= form.submit 'Save changes', class: 'gl-button btn btn-success' = form.submit 'Save changes', class: 'gl-button btn btn-confirm'
- if !issuable.persisted? && !issuable.project.empty_repo? && (guide_url = issuable.project.present.contribution_guide_path) - if !issuable.persisted? && !issuable.project.empty_repo? && (guide_url = issuable.project.present.contribution_guide_path)
.inline.gl-mt-3 .inline.gl-mt-3
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%input.js-add-list{ type: "checkbox", name: "add_list", checked: add_list } %input.js-add-list{ type: "checkbox", name: "add_list", checked: add_list }
%span= _('Add list') %span= _('Add list')
.clearfix .clearfix
%button.gl-button.btn.btn-success.float-left.js-new-label-btn{ type: "button" } %button.gl-button.btn.btn-confirm.float-left.js-new-label-btn{ type: "button" }
= _('Create') = _('Create')
%button.gl-button.btn.btn-default.float-right.js-cancel-label-btn{ type: "button" } %button.gl-button.btn.btn-default.float-right.js-cancel-label-btn{ type: "button" }
= _('Cancel') = _('Cancel')
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
= dropdown_content = dropdown_content
= dropdown_loading = dropdown_loading
= dropdown_footer add_content_class: true do = dropdown_footer add_content_class: true do
%button.gl-button.btn.btn-success.sidebar-move-issue-confirmation-button.js-move-issue-confirmation-button{ type: 'button', disabled: true } %button.gl-button.btn.btn-confirm.sidebar-move-issue-confirmation-button.js-move-issue-confirmation-button{ type: 'button', disabled: true }
= _('Move') = _('Move')
= loading_icon(css_class: 'gl-vertical-align-text-bottom sidebar-move-issue-confirmation-loading-icon') = loading_icon(css_class: 'gl-vertical-align-text-bottom sidebar-move-issue-confirmation-loading-icon')
......
...@@ -22,6 +22,6 @@ ...@@ -22,6 +22,6 @@
= html_escape(_('The CSV export will be created in the background. Once finished, it will be sent to %{strong_open}%{email}%{strong_close} in an attachment.')) % { email: @current_user.notification_email, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe } = html_escape(_('The CSV export will be created in the background. Once finished, it will be sent to %{strong_open}%{email}%{strong_close} in an attachment.')) % { email: @current_user.notification_email, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
.modal-footer .modal-footer
- if issuable_type.eql?('merge_requests') - if issuable_type.eql?('merge_requests')
= link_to _("Export merge requests"), export_csv_project_merge_requests_path(@project, request.query_parameters), method: :post, class: 'btn gl-button btn-success', data: { track_label: "export_merge_requests_csv", track_event: "click_button", track_value: "" } = link_to _("Export merge requests"), export_csv_project_merge_requests_path(@project, request.query_parameters), method: :post, class: 'btn gl-button btn-confirm', data: { track_label: "export_merge_requests_csv", track_event: "click_button", track_value: "" }
- else - else
= link_to _('Export issues'), export_csv_project_issues_path(@project, request.query_parameters), method: :post, class: 'btn gl-button btn-success', data: { track_label: "export_issues_csv", track_event: "click_button", track_value: "", qa_selector: "export_issues_button" } = link_to _('Export issues'), export_csv_project_issues_path(@project, request.query_parameters), method: :post, class: 'btn gl-button btn-confirm', data: { track_label: "export_issues_csv", track_event: "click_button", track_value: "", qa_selector: "export_issues_button" }
---
title: Move from btn-success to btn-confirm in shared/issuable directory
merge_request: 55303
author: Yogi (@yo)
type: changed
...@@ -160,7 +160,7 @@ RSpec.describe 'Labels Hierarchy', :js do ...@@ -160,7 +160,7 @@ RSpec.describe 'Labels Hierarchy', :js do
find('a.label-item', text: parent_group_label.title).click find('a.label-item', text: parent_group_label.title).click
find('a.label-item', text: project_label_1.title).click find('a.label-item', text: project_label_1.title).click
find('.btn-success').click find('.btn-confirm').click
expect(page.find('.issue-details h2.title')).to have_content('new created issue') expect(page.find('.issue-details h2.title')).to have_content('new created issue')
expect(page).to have_selector('span.gl-label-text', text: grandparent_group_label.title) expect(page).to have_selector('span.gl-label-text', text: grandparent_group_label.title)
......
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