chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 4 Wiki Activity

Fix number of uses being shown again on trending hashtags in web UI (#19484)

Browse source
This commit is contained in:
Eugen Rochko 2022-10-28 12:56:51 +02:00 committed by GitHub
parent d9d722d74b
commit 923f06a07c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/mastodon/components/hashtag.js
View file

@ -56,7 +56,6 @@ export const ImmutableHashtag = ({ hashtag }) => (
href={hashtag.get('url')} href={hashtag.get('url')}
to={`/tags/${hashtag.get('name')}`} to={`/tags/${hashtag.get('name')}`}
people={hashtag.getIn(['history', 0, 'accounts']) * 1 + hashtag.getIn(['history', 1, 'accounts']) * 1} people={hashtag.getIn(['history', 0, 'accounts']) * 1 + hashtag.getIn(['history', 1, 'accounts']) * 1}
uses={hashtag.getIn(['history', 0, 'uses']) * 1 + hashtag.getIn(['history', 1, 'uses']) * 1}
history={hashtag.get('history').reverse().map((day) => day.get('uses')).toArray()} history={hashtag.get('history').reverse().map((day) => day.get('uses')).toArray()}
/> />
); );

3
app/javascript/styles/mastodon/components.scss
View file

@ -7278,6 +7278,7 @@ noscript {
align-items: center; align-items: center;
padding: 15px; padding: 15px;
border-bottom: 1px solid lighten($ui-base-color, 8%); border-bottom: 1px solid lighten($ui-base-color, 8%);
gap: 15px;
&:last-child { &:last-child {
border-bottom: 0; border-bottom: 0;
@ -7319,8 +7320,6 @@ noscript {
font-size: 24px; font-size: 24px;
font-weight: 500; font-weight: 500;
text-align: right; text-align: right;
padding-right: 15px;
margin-left: 5px;
color: $secondary-text-color; color: $secondary-text-color;
text-decoration: none; text-decoration: none;
} }