Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
Open sidebar
Tiger Ton
mastodon
Commits
923f06a0
Unverified
Commit
923f06a0
authored
2 years ago
by
Eugen Rochko
Committed by
GitHub
2 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Fix number of uses being shown again on trending hashtags in web UI (#19484)
parent
d9d722d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/javascript/mastodon/components/hashtag.js
+0
-1
app/javascript/mastodon/components/hashtag.js
app/javascript/styles/mastodon/components.scss
+1
-2
app/javascript/styles/mastodon/components.scss
with
1 addition
and
3 deletions
+1
-3
app/javascript/mastodon/components/hashtag.js
+
0
-
1
View file @
923f06a0
...
...
@@ -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
()}
/
>
);
...
...
This diff is collapsed.
Click to expand it.
app/javascript/styles/mastodon/components.scss
+
1
-
2
View file @
923f06a0
...
...
@@ -7278,6 +7278,7 @@ noscript {
align-items
:
center
;
padding
:
15px
;
border-bottom
:
1px
solid
lighten
(
$ui-base-color
,
8%
);
gap
:
15px
;
&
:last-child
{
border-bottom
:
0
;
...
...
@@ -7319,8 +7320,6 @@ noscript {
font-size
:
24px
;
font-weight
:
500
;
text-align
:
right
;
padding-right
:
15px
;
margin-left
:
5px
;
color
:
$secondary-text-color
;
text-decoration
:
none
;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment