From 9f6c175550cf419334ca65bd71b7a456c13cb5a4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 28 Oct 2022 12:56:51 +0200
Subject: [PATCH] [Glitch] Fix number of uses being shown again on trending
hashtags in web UI
Port 923f06a07c851b25b989412f341f87f8b8fff42f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
app/javascript/flavours/glitch/components/hashtag.js | 1 -
app/javascript/flavours/glitch/styles/components/search.scss | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/app/javascript/flavours/glitch/components/hashtag.js b/app/javascript/flavours/glitch/components/hashtag.js
index 0855914390..422b9a8fa1 100644
--- a/app/javascript/flavours/glitch/components/hashtag.js
+++ b/app/javascript/flavours/glitch/components/hashtag.js
@@ -56,7 +56,6 @@ export const ImmutableHashtag = ({ hashtag }) => (
href={hashtag.get('url')}
to={`/tags/${hashtag.get('name')}`}
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()}
/>
);
diff --git a/app/javascript/flavours/glitch/styles/components/search.scss b/app/javascript/flavours/glitch/styles/components/search.scss
index ee6b1c0a79..70af0f651b 100644
--- a/app/javascript/flavours/glitch/styles/components/search.scss
+++ b/app/javascript/flavours/glitch/styles/components/search.scss
@@ -128,6 +128,7 @@
align-items: center;
padding: 15px;
border-bottom: 1px solid lighten($ui-base-color, 8%);
+ gap: 15px;
&:last-child {
border-bottom: 0;
@@ -169,8 +170,6 @@
font-size: 24px;
font-weight: 500;
text-align: right;
- padding-right: 15px;
- margin-left: 5px;
color: $secondary-text-color;
text-decoration: none;
}