alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Fix number of uses being shown again on trending hashtags in web UI 

Port 923f06a07c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
rebase/4.0.0rc1
Eugen Rochko 2022-10-28 12:56:51 +02:00 committed by Claire
parent 2cb3dd9364
commit 9f6c175550
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/flavours/glitch/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/flavours/glitch/styles/components/search.scss
View File

@ -128,6 +128,7 @@
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;
@ -169,8 +170,6 @@
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;
} }