post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Fix status meaningless space

Browse source
This commit is contained in:
KMY 2023-03-02 22:10:12 +09:00
parent 644fea6686
commit b41968da36
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/components/status.jsx
View file

@ -512,7 +512,9 @@ class Status extends ImmutablePureComponent {
let emojiReactionsBar = null; let emojiReactionsBar = null;
if (!this.props.withoutEmojiReactions && status.get('emoji_reactions')) { if (!this.props.withoutEmojiReactions && status.get('emoji_reactions')) {
const emojiReactions = status.get('emoji_reactions'); const emojiReactions = status.get('emoji_reactions');
emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />; if (emojiReactions.size > 0) {
emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />;
}
} }
return ( return (

4
app/javascript/mastodon/features/status/components/detailed_status.jsx
View file

@ -194,7 +194,9 @@ class DetailedStatus extends ImmutablePureComponent {
let emojiReactionsBar = null; let emojiReactionsBar = null;
if (status.get('emoji_reactions')) { if (status.get('emoji_reactions')) {
const emojiReactions = status.get('emoji_reactions'); const emojiReactions = status.get('emoji_reactions');
emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />; if (emojiReactions.size > 0) {
emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />;
}
} }
if (status.get('application')) { if (status.get('application')) {

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

@ -1269,7 +1269,7 @@ body > [data-popper-placement] {
margin: 8px 0 2px 4px; margin: 8px 0 2px 4px;
.emoji-reactions-bar__button { .emoji-reactions-bar__button {
background: lighten($ui-base-color, 16%); background: lighten($ui-base-color, 12%);
border: 0; border: 0;
cursor: pointer; cursor: pointer;
display: flex; display: flex;