Commit 4963303f authored by samdbeckham's avatar samdbeckham

Updates a load of modal headers to use better markup

parent 72702275
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
.modal-dialog.modal-lg .modal-dialog.modal-lg
.modal-content .modal-content
.modal-header .modal-header
%a.close{ href: "#", "data-dismiss" => "modal" } ×
%h4 %h4
Keyboard Shortcuts Keyboard Shortcuts
%small %small
= link_to '(Show all)', '#', class: 'js-more-help-button' = link_to '(Show all)', '#', class: 'js-more-help-button'
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
.row .row
.col-lg-4 .col-lg-4
......
...@@ -77,11 +77,10 @@ ...@@ -77,11 +77,10 @@
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
%button.close{ type: 'button', 'data-dismiss': 'modal' }
%span
×
%h4.modal-title %h4.modal-title
Position and size your new avatar Position and size your new avatar
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
.profile-crop-image-container .profile-crop-image-container
%img.modal-profile-crop-image{ alt: 'Avatar cropper' } %img.modal-profile-crop-image{ alt: 'Avatar cropper' }
......
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
%a.close{ href: "#", "data-dismiss" => "modal" } ×
%h3 Import projects from Bitbucket %h3 Import projects from Bitbucket
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
To enable importing projects from Bitbucket, To enable importing projects from Bitbucket,
- if current_user.admin? - if current_user.admin?
......
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
%a.close{ href: "#", "data-dismiss" => "modal" } ×
%h3 Import projects from GitLab.com %h3 Import projects from GitLab.com
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
To enable importing projects from GitLab.com, To enable importing projects from GitLab.com,
- if current_user.admin? - if current_user.admin?
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
.modal-dialog{ role: "document" } .modal-dialog{ role: "document" }
.modal-content .modal-content
.modal-header .modal-header
%button.close{ type: "button", data: { dismiss: "modal" }, aria: { label: "close" } } %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ aria: { hidden: "true" } }= icon("times") %span{ "aria-hidden": true } ×
%h4.modal-title %h4.modal-title
Create new #{name} by email Create new #{name} by email
.modal-body .modal-body
......
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
.modal-dialog.modal-lg .modal-dialog.modal-lg
.modal-content .modal-content
.modal-header .modal-header
%a.close{ href: "#", "data-dismiss" => "modal" } ×
%h3.page-title= _('Create New Directory') %h3.page-title= _('Create New Directory')
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
= form_tag project_create_dir_path(@project, @id), method: :post, remote: false, class: 'js-create-dir-form js-quick-submit js-requires-input' do = form_tag project_create_dir_path(@project, @id), method: :post, remote: false, class: 'js-create-dir-form js-quick-submit js-requires-input' do
.form-group.row .form-group.row
......
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
%a.close{ href: "#", "data-dismiss" => "modal" } ×
%h3.page-title Delete #{@blob.name} %h3.page-title Delete #{@blob.name}
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
= form_tag project_blob_path(@project, @id), method: :delete, class: 'js-delete-blob-form js-quick-submit js-requires-input' do = form_tag project_blob_path(@project, @id), method: :delete, class: 'js-delete-blob-form js-quick-submit js-requires-input' do
......
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
.modal-dialog.modal-lg .modal-dialog.modal-lg
.modal-content .modal-content
.modal-header .modal-header
%a.close{ href: "#", "data-dismiss" => "modal" } ×
%h3.page-title= title %h3.page-title= title
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
= form_tag form_path, method: method, class: 'js-quick-submit js-upload-blob-form', data: { method: method } do = form_tag form_path, method: method, class: 'js-quick-submit js-upload-blob-form', data: { method: method } do
.dropzone .dropzone
......
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
%button.close{ data: { dismiss: 'modal' } } ×
%h3.page-title %h3.page-title
- title_branch_name = capture do - title_branch_name = capture do
%span.js-branch-name.ref-name>[branch name] %span.js-branch-name.ref-name>[branch name]
= s_("Branches|Delete protected branch '%{branch_name}'?").html_safe % { branch_name: title_branch_name } = s_("Branches|Delete protected branch '%{branch_name}'?").html_safe % { branch_name: title_branch_name }
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
%p %p
......
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
%a.close{ href: "#", "data-dismiss" => "modal" } ×
%h3.page-title= title %h3.page-title= title
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
- if description - if description
%p.append-bottom-20= description %p.append-bottom-20= description
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
%h4.modal-title.float-left %h4.modal-title.float-left
= s_('DeployTokens|Revoke') = s_('DeployTokens|Revoke')
%b #{token.name}? %b #{token.name}?
%button.close{ 'aria-label' => _('Close'), 'data-dismiss' => 'modal', type: 'button' } %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ 'aria-hidden' => 'true' } × %span{ "aria-hidden": true } ×
.modal-body .modal-body
%p %p
= s_('DeployTokens|You are about to revoke') = s_('DeployTokens|You are about to revoke')
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
.modal-content .modal-content
.modal-header .modal-header
%h3 Check out, review, and merge locally %h3 Check out, review, and merge locally
%a.close{ href: "#", "data-dismiss" => "modal" } × %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
%p %p
%strong Step 1. %strong Step 1.
......
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
%a.close{ href: "#", "data-dismiss" => "modal" } ×
%h3.page-title= s_("WikiNewPageTitle|New Wiki Page") %h3.page-title= s_("WikiNewPageTitle|New Wiki Page")
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
%form.new-wiki-page %form.new-wiki-page
.form-group .form-group
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
.modal-header .modal-header
%h3.page-title %h3.page-title
Confirmation required Confirmation required
%a.close{ href: "#", "data-dismiss" => "modal" } × %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
%p.text-danger.js-confirm-text %p.text-danger.js-confirm-text
......
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
%button.close{ data: {dismiss: 'modal' } } ×
%h3.page-title Delete #{render_colored_label(label, tooltip: false)} ? %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 .modal-body
%p %p
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
%button.close{ type: "button", "aria-label": "close", data: { dismiss: "modal" } }
%span{ "aria-hidden": "true" } ×
%h4#custom-notifications-title.modal-title %h4#custom-notifications-title.modal-title
#{ _('Custom notification events') } #{ _('Custom notification events') }
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true } ×
.modal-body .modal-body
.container-fluid .container-fluid
......
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