~cytrogen/masto-fe

5fae2de454806730742b7be7435ae1c4fb97cf3c — Claire 2 years ago 8884d1e
Fix overflow behavior of account rows (#25131)

M app/javascript/mastodon/components/account.jsx => app/javascript/mastodon/components/account.jsx +7 -3
@@ 143,7 143,7 @@ class Account extends ImmutablePureComponent {
    const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));

    if (firstVerifiedField) {
      verification = <>· <VerifiedBadge link={firstVerifiedField.get('value')} /></>;
      verification = <VerifiedBadge link={firstVerifiedField.get('value')} />;
    }

    return (


@@ 154,9 154,13 @@ class Account extends ImmutablePureComponent {
              <Avatar account={account} size={size} />
            </div>

            <div>
            <div className='account__contents'>
              <DisplayName account={account} />
              {!minimal && <><ShortNumber value={account.get('followers_count')} renderer={counterRenderer('followers')} /> {verification} {muteTimeRemaining}</>}
              {!minimal && (
                <div className='account__details'>
                  <ShortNumber value={account.get('followers_count')} renderer={counterRenderer('followers')} /> {verification} {muteTimeRemaining}
                </div>
              )}
            </div>
          </Link>


M app/javascript/styles/mastodon/components.scss => app/javascript/styles/mastodon/components.scss +16 -1
@@ 7814,13 7814,28 @@ noscript {
  }
}

.account__contents {
  overflow: hidden;
}

.account__details {
  display: flex;
  flex-wrap: wrap;
  column-gap: 1em;
}

.verified-badge {
  display: inline-flex;
  align-items: center;
  color: $valid-value-color;
  gap: 4px;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;

  > span {
    overflow: hidden;
    text-overflow: ellipsis;
  }

  a {
    color: inherit;