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

This commit is contained in:
KMY 2024-08-21 12:39:30 +09:00
commit af0f8f01e1
136 changed files with 693 additions and 756 deletions

View file

@ -2,7 +2,7 @@
.strike-entry__header
.strike-entry__avatar
.indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' }
= fa_icon 'warning'
= material_symbol 'warning'
.strike-entry__content
.strike-entry__title
= t 'disputes.strikes.title',

View file

@ -1,7 +1,7 @@
%tr
%td
%span{ title: session.user_agent }<
= fa_icon "#{session_device_icon(session)} fw", 'aria-label': session_device_icon(session)
= material_symbol session_device_icon(session), 'aria-label': session_device_icon(session)
&nbsp;
= t 'sessions.description',
browser: t("sessions.browsers.#{session.browser}", default: session.browser.to_s),
@ -15,4 +15,4 @@
%time.time-ago{ datetime: session.updated_at.iso8601, title: l(session.updated_at) }= l(session.updated_at)
%td
- if current_session.session_id != session.session_id && !current_account.suspended?
= table_link_to 'times', t('sessions.revoke'), settings_session_path(session), method: :delete
= table_link_to 'close', t('sessions.revoke'), settings_session_path(session), method: :delete