Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-26 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-09-02 12:20:33 +02:00
parent cb50d95c06 a7d96e6aff
commit fbbe9f1c12
6 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/mastodon/components/hashtag_bar.tsx
View File

@@ -10,8 +10,8 @@ import { groupBy, minBy } from 'lodash';
import { getStatusContent } from './status_content';
// About two lines on desktop
const VISIBLE_HASHTAGS = 7;
// Fit on a single line on desktop
const VISIBLE_HASHTAGS = 3;
// Those types are not correct, they need to be replaced once this part of the state is typed
export type TagLike = Record<{ name: string }>;
@@ -210,7 +210,7 @@ const HashtagBar: React.FC<{
const revealedHashtags = expanded
? hashtags
: hashtags.slice(0, VISIBLE_HASHTAGS - 1);
: hashtags.slice(0, VISIBLE_HASHTAGS);
return (
<div className='hashtag-bar'>