Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-29 07:03:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict because one of the removed lines was modified to accomodate for
  glitch-soc's slightly different build system.
  Removed the lines as upstream did.
This commit is contained in:
Claire
2025-01-21 19:23:25 +01:00
parent b0bf355911 3dcf5e12b1
commit 05e5db91c7
44 changed files with 939 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/settings/two_factor_authentication/otp_authentication/show.html.haml
View File

@@ -6,4 +6,4 @@
%hr.spacer/
= link_to t('otp_authentication.setup'), settings_otp_authentication_path, data: { method: :post }, class: 'block-button'
= link_to t('otp_authentication.setup'), settings_otp_authentication_path, data: { method: :post }, class: 'button button--block'

2
app/views/settings/two_factor_authentication/webauthn_credentials/index.html.haml
View File

@@ -14,4 +14,4 @@
%hr.spacer/
.simple_form
= link_to t('webauthn_credentials.add'), new_settings_webauthn_credential_path, class: 'block-button'
= link_to t('webauthn_credentials.add'), new_settings_webauthn_credential_path, class: 'button button--block'