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

Merge branch 'kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-03-04 16:20:34 +09:00
commit 3e1b4108ed
6 changed files with 84 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -515,7 +515,9 @@ class Status extends ImmutablePureComponent {
let emojiReactionsBar = null;
if (!this.props.withoutEmojiReactions && 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 (

3
app/javascript/mastodon/features/notifications/components/filter_bar.jsx
View file

@ -6,6 +6,7 @@ import Icon from 'mastodon/components/icon';
const tooltips = defineMessages({
mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favourites' },
emojiReactions: { id: 'notifications.filter.emoji_reactions', defaultMessage: 'Emoji reactions' },
boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' },
polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
@ -79,7 +80,7 @@ class FilterBar extends React.PureComponent {
onClick={this.onClick('emoji_reaction')}
title={intl.formatMessage(tooltips.emojiReactions)}
>
<Icon id='star' fixedWidth />
<Icon id='smile-o' fixedWidth />
</button>
<button
className={selectedFilter === 'reblog' ? 'active' : ''}

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

@ -197,7 +197,9 @@ class DetailedStatus extends ImmutablePureComponent {
let emojiReactionsBar = null;
if (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')) {

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

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

27
app/javascript/styles/mastodon/rich_text.scss
View file

@ -1,3 +1,4 @@
.account__header__bio,
.status__content__text,
.e-content,
.reply-indicator__content {
@ -12,6 +13,32 @@
}
}
code, pre {
border: 1px solid $ui-primary-color;
font-family: monospace;
}
code {
margin: 0 4px;
}
pre {
padding: 4px 8px;
span.ellipsis::after {
content: "";
}
span.invisible {
display: inline;
font-size: inherit;
line-height: inherit;
width: inherit;
height: inherit;
position: static;
}
}
blockquote {
padding-left: 10px;
border-left: 3px solid $darker-text-color;