Fix use of inline CSS in public pages (#13576)
Change `account_link_to` to use an image tag rather than some inline CSS. Dropped the `size` parameter in the process, but it wasn't used for anything except the default value of 36px. Dropped CSS rules that were always overriden, and defaulted to 36px width and height instead.
This commit is contained in:
		
							parent
							
								
									e223fd8c61
								
							
						
					
					
						commit
						c0b849bdfd
					
				
					 5 changed files with 9 additions and 22 deletions
				
			
		| 
						 | 
					@ -7,13 +7,13 @@ module HomeHelper
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def account_link_to(account, button = '', size: 36, path: nil)
 | 
					  def account_link_to(account, button = '', path: nil)
 | 
				
			||||||
    content_tag(:div, class: 'account') do
 | 
					    content_tag(:div, class: 'account') do
 | 
				
			||||||
      content_tag(:div, class: 'account__wrapper') do
 | 
					      content_tag(:div, class: 'account__wrapper') do
 | 
				
			||||||
        section = if account.nil?
 | 
					        section = if account.nil?
 | 
				
			||||||
                    content_tag(:div, class: 'account__display-name') do
 | 
					                    content_tag(:div, class: 'account__display-name') do
 | 
				
			||||||
                      content_tag(:div, class: 'account__avatar-wrapper') do
 | 
					                      content_tag(:div, class: 'account__avatar-wrapper') do
 | 
				
			||||||
                        content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{full_asset_url('avatars/original/missing.png', skip_pipeline: true)})")
 | 
					                        image_tag(full_asset_url('avatars/original/missing.png', skip_pipeline: true), class: 'account__avatar')
 | 
				
			||||||
                      end +
 | 
					                      end +
 | 
				
			||||||
                        content_tag(:span, class: 'display-name') do
 | 
					                        content_tag(:span, class: 'display-name') do
 | 
				
			||||||
                          content_tag(:strong, t('about.contact_missing')) +
 | 
					                          content_tag(:strong, t('about.contact_missing')) +
 | 
				
			||||||
| 
						 | 
					@ -23,7 +23,7 @@ module HomeHelper
 | 
				
			||||||
                  else
 | 
					                  else
 | 
				
			||||||
                    link_to(path || ActivityPub::TagManager.instance.url_for(account), class: 'account__display-name') do
 | 
					                    link_to(path || ActivityPub::TagManager.instance.url_for(account), class: 'account__display-name') do
 | 
				
			||||||
                      content_tag(:div, class: 'account__avatar-wrapper') do
 | 
					                      content_tag(:div, class: 'account__avatar-wrapper') do
 | 
				
			||||||
                        content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url)})")
 | 
					                        image_tag(full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), class: 'account__avatar')
 | 
				
			||||||
                      end +
 | 
					                      end +
 | 
				
			||||||
                        content_tag(:span, class: 'display-name') do
 | 
					                        content_tag(:span, class: 'display-name') do
 | 
				
			||||||
                          content_tag(:bdi) do
 | 
					                          content_tag(:bdi) do
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -543,12 +543,6 @@ $small-breakpoint: 960px;
 | 
				
			||||||
        flex: 0 0 auto;
 | 
					        flex: 0 0 auto;
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      &__avatar {
 | 
					 | 
				
			||||||
        width: 44px;
 | 
					 | 
				
			||||||
        height: 44px;
 | 
					 | 
				
			||||||
        background-size: 44px 44px;
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      .display-name {
 | 
					      .display-name {
 | 
				
			||||||
        font-size: 15px;
 | 
					        font-size: 15px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -749,12 +743,6 @@ $small-breakpoint: 960px;
 | 
				
			||||||
        display: flex;
 | 
					        display: flex;
 | 
				
			||||||
        align-items: center;
 | 
					        align-items: center;
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					 | 
				
			||||||
      .account__avatar {
 | 
					 | 
				
			||||||
        width: 44px;
 | 
					 | 
				
			||||||
        height: 44px;
 | 
					 | 
				
			||||||
        background-size: 44px 44px;
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    &__counters__wrapper {
 | 
					    &__counters__wrapper {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1318,8 +1318,13 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.account__avatar {
 | 
					.account__avatar {
 | 
				
			||||||
  @include avatar-radius;
 | 
					  @include avatar-radius;
 | 
				
			||||||
 | 
					  display: block;
 | 
				
			||||||
  position: relative;
 | 
					  position: relative;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  width: 36px;
 | 
				
			||||||
 | 
					  height: 36px;
 | 
				
			||||||
 | 
					  background-size: 36px 36px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  &-inline {
 | 
					  &-inline {
 | 
				
			||||||
    display: inline-block;
 | 
					    display: inline-block;
 | 
				
			||||||
    vertical-align: middle;
 | 
					    vertical-align: middle;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -93,12 +93,6 @@
 | 
				
			||||||
      display: flex;
 | 
					      display: flex;
 | 
				
			||||||
      align-items: center;
 | 
					      align-items: center;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					 | 
				
			||||||
    .account__avatar {
 | 
					 | 
				
			||||||
      width: 44px;
 | 
					 | 
				
			||||||
      height: 44px;
 | 
					 | 
				
			||||||
      background-size: 44px 44px;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  .trends__item {
 | 
					  .trends__item {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -25,7 +25,7 @@
 | 
				
			||||||
  - target_account = reports.first.target_account
 | 
					  - target_account = reports.first.target_account
 | 
				
			||||||
  .report-card
 | 
					  .report-card
 | 
				
			||||||
    .report-card__profile
 | 
					    .report-card__profile
 | 
				
			||||||
      = account_link_to target_account, '', size: 36, path: admin_account_path(target_account.id)
 | 
					      = account_link_to target_account, '', path: admin_account_path(target_account.id)
 | 
				
			||||||
      .report-card__profile__stats
 | 
					      .report-card__profile__stats
 | 
				
			||||||
        = link_to t('admin.reports.account.notes', count: target_account.targeted_moderation_notes.count), admin_account_path(target_account.id)
 | 
					        = link_to t('admin.reports.account.notes', count: target_account.targeted_moderation_notes.count), admin_account_path(target_account.id)
 | 
				
			||||||
        %br/
 | 
					        %br/
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue