diff --git a/app/assets/tailwind/sure-design-system/base.css b/app/assets/tailwind/sure-design-system/base.css index 10a6bbd33..522cdcf37 100644 --- a/app/assets/tailwind/sure-design-system/base.css +++ b/app/assets/tailwind/sure-design-system/base.css @@ -1,9 +1,9 @@ @layer base { button { - @apply cursor-pointer focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-900; + @apply cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-alpha-black-300; @variant theme-dark { - @apply focus-visible:outline-white; + @apply focus-visible:ring-alpha-white-300; } } diff --git a/app/components/DS/button.rb b/app/components/DS/button.rb index 667b85e3d..ca5644225 100644 --- a/app/components/DS/button.rb +++ b/app/components/DS/button.rb @@ -22,7 +22,6 @@ class DS::Button < DS::Buttonish def merged_opts merged_opts = opts.dup || {} extra_classes = merged_opts.delete(:class) - href = merged_opts.delete(:href) data = merged_opts.delete(:data) || {} if confirm.present? @@ -37,7 +36,8 @@ class DS::Button < DS::Buttonish # spec — meaning a DS::Button rendered inside a form will steal Enter-key # submission from the first text input. Default to `type="button"` so # callers must opt into submit behavior explicitly. `button_to` (href - # branch) wraps the button in its own form, so submit there is correct. + # branch) wraps the button in its own form, so submit there is correct + # and we leave its default alone. if href.blank? merged_opts[:type] ||= "button" end diff --git a/app/views/settings/profiles/show.html.erb b/app/views/settings/profiles/show.html.erb index 245ac27db..ebe10ec92 100644 --- a/app/views/settings/profiles/show.html.erb +++ b/app/views/settings/profiles/show.html.erb @@ -19,7 +19,7 @@