diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-01 18:56:41 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-01 18:56:41 +0300 |
| commit | eeb73247aaf7002e81a3863bcbf376bbb7e692a4 (patch) | |
| tree | 04ec78b45960e9ad6789ce86a0959b9dd1f52676 /app/views/shared | |
| parent | c5f89e5bd7f9371882de8b6ad62d24467b22937b (diff) | |
| parent | e6c87b74866a9e53d17eaf63fda00f18f3d8a80e (diff) | |
Merge branch '47113-modal-header-styling-is-broken' into 'master'
Resolve "Modal header styling is broken"
Closes #47113
See merge request gitlab-org/gitlab-ce!19312
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/_confirm_modal.html.haml | 3 | ||||
| -rw-r--r-- | app/views/shared/_delete_label_modal.html.haml | 3 | ||||
| -rw-r--r-- | app/views/shared/notifications/_custom_notifications.html.haml | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/app/views/shared/_confirm_modal.html.haml b/app/views/shared/_confirm_modal.html.haml index 7c326d36d99..1dcf4369253 100644 --- a/app/views/shared/_confirm_modal.html.haml +++ b/app/views/shared/_confirm_modal.html.haml @@ -4,7 +4,8 @@ .modal-header %h3.page-title Confirmation required - %a.close{ href: "#", "data-dismiss" => "modal" } × + %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') } + %span{ "aria-hidden": true } × .modal-body %p.text-danger.js-confirm-text diff --git a/app/views/shared/_delete_label_modal.html.haml b/app/views/shared/_delete_label_modal.html.haml index 01effefc34d..b96380923ac 100644 --- a/app/views/shared/_delete_label_modal.html.haml +++ b/app/views/shared/_delete_label_modal.html.haml @@ -2,8 +2,9 @@ .modal-dialog .modal-content .modal-header - %button.close{ data: {dismiss: 'modal' } } × %h3.page-title Delete #{render_colored_label(label, tooltip: false)} ? + %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') } + %span{ "aria-hidden": true } × .modal-body %p diff --git a/app/views/shared/notifications/_custom_notifications.html.haml b/app/views/shared/notifications/_custom_notifications.html.haml index 51d912b4a66..1f6e8f98bbb 100644 --- a/app/views/shared/notifications/_custom_notifications.html.haml +++ b/app/views/shared/notifications/_custom_notifications.html.haml @@ -2,10 +2,10 @@ .modal-dialog .modal-content .modal-header - %button.close{ type: "button", "aria-label": "close", data: { dismiss: "modal" } } - %span{ "aria-hidden": "true" } × %h4#custom-notifications-title.modal-title #{ _('Custom notification events') } + %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') } + %span{ "aria-hidden": true } × .modal-body .container-fluid |