gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into upstream-20240123

Browse source
This commit is contained in:
KMY 2025-01-23 18:10:34 +09:00
commit 50ae2d9439
320 changed files with 2587 additions and 2817 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/accounts/index.html.haml
View file

@ -39,7 +39,7 @@
.actions
%button.button= t('admin.accounts.search')
= link_to t('admin.accounts.reset'), admin_accounts_path, class: 'button negative'
= link_to t('admin.accounts.reset'), admin_accounts_path, class: 'button button--dangerous'
%hr.spacer/

4
app/views/admin/custom_emojis/index.html.haml
View file

@ -35,7 +35,7 @@
.actions
%button.button= t('admin.accounts.search')
= link_to t('admin.accounts.reset'), admin_custom_emojis_path, class: 'button negative'
= link_to t('admin.accounts.reset'), admin_custom_emojis_path, class: 'button button--dangerous'
= form_with model: @form, url: batch_admin_custom_emojis_path do |f|
= hidden_field_tag :page, params[:page] || 1
@ -72,7 +72,7 @@
.input.select.optional
.label_input
= f.select :category_id,
options_from_collection_for_select(CustomEmojiCategory.all, 'id', 'name'),
options_from_collection_for_select(CustomEmojiCategory.alphabetic.all, 'id', 'name'),
'aria-label': t('admin.custom_emojis.assign_category'),
class: 'select optional',
prompt: t('admin.custom_emojis.assign_category')

2
app/views/admin/domain_blocks/confirm_suspension.html.haml
View file

@ -19,4 +19,4 @@
.actions
= link_to t('.cancel'), admin_instances_path, class: 'button button-tertiary'
= f.button :submit, t('.confirm'), class: 'button negative', name: :confirm
= f.button :submit, t('.confirm'), class: 'button button--dangerous', name: :confirm

2
app/views/admin/instances/index.html.haml
View file

@ -42,7 +42,7 @@
.actions
%button.button= t('admin.accounts.search')
= link_to t('admin.accounts.reset'), admin_instances_path, class: 'button negative'
= link_to t('admin.accounts.reset'), admin_instances_path, class: 'button button--dangerous'
%hr.spacer/

2
app/views/admin/relays/index.html.haml
View file

@ -3,7 +3,7 @@
.simple_form
%p.hint= t('admin.relays.description_html')
= link_to @relays.empty? ? t('admin.relays.setup') : t('admin.relays.add_new'), new_admin_relay_path, class: 'block-button'
= link_to @relays.empty? ? t('admin.relays.setup') : t('admin.relays.add_new'), new_admin_relay_path, class: 'button button--block'
- unless @relays.empty?
%hr.spacer

2
app/views/admin/reports/index.html.haml
View file

@ -28,7 +28,7 @@
.actions
%button.button= t('admin.accounts.search')
= link_to t('admin.accounts.reset'), admin_reports_path, class: 'button negative'
= link_to t('admin.accounts.reset'), admin_reports_path, class: 'button button--dangerous'
- @reports.group_by(&:target_account_id).each_value do |reports|
- target_account = reports.first.target_account

2
app/views/admin/tags/index.html.haml
View file

@ -25,7 +25,7 @@
.actions
%button.button= t('admin.tags.search')
= link_to t('admin.tags.reset'), admin_tags_path, class: 'button negative'
= link_to t('admin.tags.reset'), admin_tags_path, class: 'button button--dangerous'
%hr.spacer/

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'

2
app/views/settings/two_factor_authentication_methods/index.html.haml
View file

@ -38,4 +38,4 @@
%hr.spacer/
.simple_form
= link_to t('two_factor_authentication.generate_recovery_codes'), settings_two_factor_authentication_recovery_codes_path, data: { method: :post }, class: 'block-button'
= link_to t('two_factor_authentication.generate_recovery_codes'), settings_two_factor_authentication_recovery_codes_path, data: { method: :post }, class: 'button button--block'

2
app/views/settings/verifications/show.html.haml
View file

@ -65,7 +65,7 @@
%p.lead= t('author_attribution.then_instructions')
.fields-group
= f.input :attribution_domains_as_text, as: :text, wrapper: :with_block_label, input_html: { placeholder: "example1.com\nexample2.com\nexample3.com", rows: 4, autocapitalize: 'none', autocorrect: 'off' }
= f.input :attribution_domains, as: :text, wrapper: :with_block_label, input_html: { value: @account.attribution_domains.join("\n"), placeholder: "example1.com\nexample2.com\nexample3.com", rows: 4, autocapitalize: 'none', autocorrect: 'off' }
.actions
= f.button :button, t('generic.save_changes'), type: :submit