From fc96671f817239041ba2747af835a8d5d9aa3739 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 15 Oct 2019 12:06:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/shared/form_elements/_apply_template_warning.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/shared/form_elements') diff --git a/app/views/shared/form_elements/_apply_template_warning.html.haml b/app/views/shared/form_elements/_apply_template_warning.html.haml index 9027264d221..09ca59a520c 100644 --- a/app/views/shared/form_elements/_apply_template_warning.html.haml +++ b/app/views/shared/form_elements/_apply_template_warning.html.haml @@ -2,7 +2,7 @@ .offset-sm-2.col-sm-10 .warning_message.mb-0{ role: 'alert' } - %btn.js-close-btn.close{ type: "button", "aria-hidden": true, "aria-label": _("Close") } + %btn.js-close-btn.js-dismiss-btn.close{ type: "button", "aria-hidden": true, "aria-label": _("Close") } = sprite_icon("close") %p @@ -10,5 +10,5 @@ %button.js-override-template.btn.btn-warning.mr-2{ type: 'button' } = _("Apply template") - %button.js-cancel-btn.btn.btn-inverted{ type: 'button' } + %button.js-close-btn.js-cancel-btn.btn.btn-inverted{ type: 'button' } = _("Cancel") -- cgit v1.2.1