Fix close buttons for Bootstrap 5

This commit is contained in:
Andreas Nedbal 2023-01-04 11:48:22 +01:00 committed by Andreas Nedbal
parent 7450143311
commit 5612f8d2bd
8 changed files with 8 additions and 10 deletions

View file

@ -4,7 +4,6 @@
- flash.each do |key, value|
.alert.alert-dismissible{ class: "alert-#{bootstrap_color key}", role: :alert }
%button.close{ type: :button, data: { dismiss: :alert } }
%span{ aria: { hidden: true } } ×
%button.btn-close{ type: :button, data: { dismiss: :alert } }
%span.visually-hidden= t("voc.close")
= value

View file

@ -3,7 +3,7 @@
.modal-content{ data: { controller: "character-count", "character-count-max-value": 512 }}
.modal-header
%h5.modal-title#modal-ask-followers-label= t(".title")
%button.close{ data: { dismiss: :modal }, type: :button }
%button.btn-close{ data: { dismiss: :modal }, type: :button }
%span{ aria: { hidden: true } } ×
%span.visually-hidden= t("voc.close")
.modal-body

View file

@ -5,7 +5,7 @@
.modal-header
%h5.modal-title#modal-ban-label
= t '.title'
%button.close{ data: { dismiss: :modal }, type: :button }
%button.btn-close{ data: { dismiss: :modal }, type: :button }
%span{ aria: { hidden: true } } ×
%span.visually-hidden= t("voc.close")
= bootstrap_form_tag(url: '/mod/ban', html: { method: :post, novalidate: :novalidate }) do |f|

View file

@ -3,7 +3,7 @@
.modal-content
.modal-header
%h5.modal-title#modal-commentsmile-label= t(".title")
%button.close{ data: { dismiss: :modal }, type: :button }
%button.btn-close{ data: { dismiss: :modal }, type: :button }
%span{ aria: { hidden: true } } ×
%span.visually-hidden Close
.modal-body

View file

@ -3,7 +3,7 @@
.modal-content
.modal-header
%h5.modal-title#modal-list-memberships-label= t(".title")
%button.close{ data: { dismiss: :modal }, type: :button }
%button.btn-close{ data: { dismiss: :modal }, type: :button }
%span{ aria: { hidden: true } } ×
%span.visually-hidden= t("voc.close")
%div{ role: :tabpanel }

View file

@ -3,7 +3,7 @@
.modal-content
.modal-header
%h5.modal-title#modal-passwd-label= t(".title")
%button.close{ data: { dismiss: :modal }, type: :button }
%button.btn-close{ data: { dismiss: :modal }, type: :button }
%span{ aria: { hidden: true } } ×
%span.visually-hidden= t("voc.close")
.modal-body

View file

@ -4,7 +4,7 @@
.modal-header
%h5.modal-title#modal-privileges-label
= t(".title", user: user.screen_name)
%button.close{ data: { dismiss: :modal }, type: :button }
%button.btn-close{ data: { dismiss: :modal }, type: :button }
%span{ aria: { hidden: true } } ×
%span.visually-hidden= t("voc.close")
%ul.list-group

View file

@ -2,8 +2,7 @@
- @active_announcements.each do |announcement|
.alert.announcement.alert-info.alert-dismissable.d-none{ data: { controller: 'announcement', "announcement-id-value": announcement.id } }
.container
%button.close{ type: :button, data: { dismiss: :alert, action: "click->announcement#close" } }
%span{ aria: { hidden: true } } ×
%button.btn-close{ type: :button, data: { dismiss: :alert, action: "click->announcement#close" } }
%p
= announcement.content
- if announcement.link_present?