diff --git a/app/helpers/admin/account_moderation_notes_helper.rb b/app/helpers/admin/account_moderation_notes_helper.rb index 2a3d954a35..796aff2b68 100644 --- a/app/helpers/admin/account_moderation_notes_helper.rb +++ b/app/helpers/admin/account_moderation_notes_helper.rb @@ -28,7 +28,7 @@ module Admin::AccountModerationNotesHelper def labeled_account_avatar(account) safe_join( [ - image_tag(account.avatar.url, width: 15, height: 15, alt: '', class: 'avatar'), + image_tag(account.avatar.url, size: 15, alt: '', class: 'avatar'), account_inline_text(account), ], ' ' diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb index c5b83326db..9a9a990a7a 100644 --- a/app/helpers/home_helper.rb +++ b/app/helpers/home_helper.rb @@ -13,7 +13,7 @@ module HomeHelper section = if account.nil? content_tag(:div, class: 'account__display-name') do content_tag(:div, class: 'account__avatar-wrapper') do - image_tag(full_asset_url('avatars/original/missing.png', skip_pipeline: true), class: 'account__avatar') + image_tag(full_asset_url('avatars/original/missing.png', skip_pipeline: true), class: 'account__avatar', size: 46) end + content_tag(:span, class: 'display-name') do content_tag(:strong, t('about.contact_missing')) + @@ -23,7 +23,7 @@ module HomeHelper else link_to(path || ActivityPub::TagManager.instance.url_for(account), class: 'account__display-name') do content_tag(:div, class: 'account__avatar-wrapper') do - image_tag(full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), class: 'account__avatar', width: 46, height: 46) + image_tag(full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), class: 'account__avatar', size: 46) end + content_tag(:span, class: 'display-name') do content_tag(:bdi) do diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index fd631ce92e..6c8a3bc7e6 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -39,7 +39,7 @@ module SettingsHelper return if account.nil? link_to ActivityPub::TagManager.instance.url_for(account), class: 'name-tag', title: account.acct do - safe_join([image_tag(account.avatar.url, width: 15, height: 15, alt: '', class: 'avatar'), content_tag(:span, account.acct, class: 'username')], ' ') + safe_join([image_tag(account.avatar.url, size: 15, alt: '', class: 'avatar'), content_tag(:span, account.acct, class: 'username')], ' ') end end diff --git a/app/views/admin/action_logs/_action_log.html.haml b/app/views/admin/action_logs/_action_log.html.haml index dcc3331809..2b01a0ba1f 100644 --- a/app/views/admin/action_logs/_action_log.html.haml +++ b/app/views/admin/action_logs/_action_log.html.haml @@ -1,7 +1,7 @@ .log-entry .log-entry__header .log-entry__avatar - = image_tag action_log.account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar' + = image_tag action_log.account.avatar.url(:original), alt: '', size: 40, class: 'avatar' .log-entry__content .log-entry__title = t "admin.action_logs.actions.#{action_log.action}_#{action_log.target_type.underscore}_html", diff --git a/app/views/admin/disputes/appeals/_appeal.html.haml b/app/views/admin/disputes/appeals/_appeal.html.haml index d5611211ed..6ea65461c1 100644 --- a/app/views/admin/disputes/appeals/_appeal.html.haml +++ b/app/views/admin/disputes/appeals/_appeal.html.haml @@ -1,7 +1,7 @@ = link_to disputes_strike_path(appeal.strike), class: ['log-entry', appeal.approved? && 'log-entry--inactive'] do .log-entry__header .log-entry__avatar - = image_tag appeal.account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar' + = image_tag appeal.account.avatar.url(:original), alt: '', size: 40, class: 'avatar' .log-entry__content .log-entry__title = strike_action_label(appeal) diff --git a/app/views/admin/invites/_invite.html.haml b/app/views/admin/invites/_invite.html.haml index e3e5d32542..8ee7a97891 100644 --- a/app/views/admin/invites/_invite.html.haml +++ b/app/views/admin/invites/_invite.html.haml @@ -7,7 +7,7 @@ %td .name-tag - = image_tag invite.user.account.avatar.url(:original), alt: '', width: 16, height: 16, class: 'avatar' + = image_tag invite.user.account.avatar.url(:original), alt: '', size: 16, class: 'avatar' %span.username= invite.user.account.username - if invite.valid_for_use? diff --git a/app/views/application/_card.html.haml b/app/views/application/_card.html.haml index ae74f1dc63..26ee77892f 100644 --- a/app/views/application/_card.html.haml +++ b/app/views/application/_card.html.haml @@ -8,7 +8,7 @@ = image_tag account.header.url, alt: '' .card__bar .avatar - = image_tag account.avatar.url, alt: '', width: 48, height: 48, class: 'u-photo' + = image_tag account.avatar.url, alt: '', size: 48, class: 'u-photo' .display-name %bdi diff --git a/app/views/application/mailer/_account.html.haml b/app/views/application/mailer/_account.html.haml index 27493f770d..37dd90019b 100644 --- a/app/views/application/mailer/_account.html.haml +++ b/app/views/application/mailer/_account.html.haml @@ -8,7 +8,7 @@ %table.email-account-banner-icon-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' } %tr %td - %img{ src: full_asset_url(account.avatar.url), width: 80, height: 80, alt: '' } + %img{ src: full_asset_url(account.avatar.url), size: 80, alt: '' } %table.email-w-full.email-account-body-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' } %tr %td.email-account-body-td diff --git a/app/views/application/mailer/_checklist.html.haml b/app/views/application/mailer/_checklist.html.haml index 91c7c98f26..c60c381261 100644 --- a/app/views/application/mailer/_checklist.html.haml +++ b/app/views/application/mailer/_checklist.html.haml @@ -11,12 +11,12 @@ %tr %td.email-checklist-icons-checkbox-td - if defined?(checked) && checked - = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-on.png'), alt: '', width: 20, height: 20 + = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-on.png'), alt: '', size: 20 - else - = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20 + = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-off.png'), alt: '', size: 20 %td.email-checklist-icons-step-td - if defined?(key) - = image_tag frontend_asset_url("images/mailer-new/welcome-icons/#{key}_step-#{checked ? 'on' : 'off'}.png"), alt: '', width: 40, height: 40 + = image_tag frontend_asset_url("images/mailer-new/welcome-icons/#{key}_step-#{checked ? 'on' : 'off'}.png"), alt: '', size: 40 %td.email-checklist-text-td .email-desktop-flex /[if mso] diff --git a/app/views/application/mailer/_follow.html.haml b/app/views/application/mailer/_follow.html.haml index 382151a234..1c00b7ef46 100644 --- a/app/views/application/mailer/_follow.html.haml +++ b/app/views/application/mailer/_follow.html.haml @@ -7,7 +7,7 @@ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' } %tr %td.email-mini-follow-img-td - = image_tag full_asset_url(follow.account.avatar.url), alt: '', width: 40, height: 40 + = image_tag full_asset_url(follow.account.avatar.url), alt: '', size: 40 %td.email-mini-follow-text-td %h3= follow.account.display_name.presence || follow.account.username %p @#{follow.account.pretty_acct} diff --git a/app/views/application/mailer/_hashtag.html.haml b/app/views/application/mailer/_hashtag.html.haml index 0fe7117bc4..3411b24d4a 100644 --- a/app/views/application/mailer/_hashtag.html.haml +++ b/app/views/application/mailer/_hashtag.html.haml @@ -15,6 +15,6 @@ %td.email-mini-hashtag-img-td - accounts.each do |account| %span.email-mini-hashtag-img-span - = image_tag full_asset_url(account.avatar.url), alt: '', width: 16, height: 16 + = image_tag full_asset_url(account.avatar.url), alt: '', size: 16 %td %p= recent_tag_usage(hashtag) diff --git a/app/views/application/mailer/_heading.html.haml b/app/views/application/mailer/_heading.html.haml index 8b1f3f9ffc..321f359776 100644 --- a/app/views/application/mailer/_heading.html.haml +++ b/app/views/application/mailer/_heading.html.haml @@ -6,7 +6,7 @@ %tr - if image_url %td.email-header-heading-img-td - = image_tag image_url, alt: '', width: 56, height: 56 + = image_tag image_url, alt: '', size: 56 %td.email-header-heading-txt-td %h1= title - if subtitle diff --git a/app/views/filters/statuses/_status_filter.html.haml b/app/views/filters/statuses/_status_filter.html.haml index d0d04638d2..e5c9922946 100644 --- a/app/views/filters/statuses/_status_filter.html.haml +++ b/app/views/filters/statuses/_status_filter.html.haml @@ -20,7 +20,7 @@ .detailed-status__meta = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'name-tag', target: '_blank', rel: 'noopener noreferrer' do - = image_tag(status.account.avatar.url, width: 15, height: 15, alt: '', class: 'avatar') + = image_tag(status.account.avatar.url, size: 15, alt: '', class: 'avatar') .username= status.account.acct ยท = link_to ActivityPub::TagManager.instance.url_for(status), class: 'detailed-status__datetime', target: stream_link_target, rel: 'noopener noreferrer' do diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml index 270f2b1e0c..c671a7a879 100644 --- a/app/views/layouts/mailer.html.haml +++ b/app/views/layouts/mailer.html.haml @@ -75,7 +75,7 @@ %td.email-footer-td %p.email-footer-p = link_to root_url, class: 'email-footer-logo-a' do - = image_tag frontend_asset_url('images/mailer-new/common/logo-footer.png'), alt: 'Mastodon', width: 44, height: 44 + = image_tag frontend_asset_url('images/mailer-new/common/logo-footer.png'), alt: 'Mastodon', size: 44 %p.email-footer-p = t 'about.hosted_on', domain: site_hostname %p.email-footer-p diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml index bf38dc9aa2..de1a40a9a5 100644 --- a/app/views/notification_mailer/_status.html.haml +++ b/app/views/notification_mailer/_status.html.haml @@ -1,7 +1,7 @@ %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' } %tr %td.email-status-header-img - = image_tag full_asset_url(status.account.avatar.url), alt: '', width: 48, height: 48 + = image_tag full_asset_url(status.account.avatar.url), alt: '', size: 48 %td.email-status-header-text %h2.email-status-header-name = display_name(status.account) diff --git a/app/views/settings/verifications/show.html.haml b/app/views/settings/verifications/show.html.haml index 4def10e595..a8a77d64f4 100644 --- a/app/views/settings/verifications/show.html.haml +++ b/app/views/settings/verifications/show.html.haml @@ -51,7 +51,7 @@ %strong.status-card__title= t('author_attribution.example_title') .more-from-author = logo_as_symbol(:icon) - = t('author_attribution.more_from_html', name: link_to(root_url, class: 'story__details__shared__author-link') { image_tag(@account.avatar.url, class: 'account__avatar', width: 16, height: 16, alt: '') + tag.bdi(display_name(@account)) }) + = t('author_attribution.more_from_html', name: link_to(root_url, class: 'story__details__shared__author-link') { image_tag(@account.avatar.url, class: 'account__avatar', size: 16, alt: '') + tag.bdi(display_name(@account)) }) %h4= t('verification.here_is_how')