Merge branch 'develop' into pl-api-updates
This commit is contained in:
commit
929f6726fb
5 changed files with 5 additions and 5 deletions
|
@ -398,7 +398,7 @@ const FavouriteButton: React.FC<IActionButton> = ({
|
||||||
const favouriteButton = (
|
const favouriteButton = (
|
||||||
<StatusActionButton
|
<StatusActionButton
|
||||||
title={intl.formatMessage(messages.favourite)}
|
title={intl.formatMessage(messages.favourite)}
|
||||||
icon={features.statusDislikes ? require('@tabler/icons/outline/thumb-up.svg') : require('@tabler/icons/outline/heart.svg')}
|
icon={features.statusDislikes ? require('@tabler/icons/outline/thumb-up.svg') : require('@tabler/icons/outline/star.svg')}
|
||||||
color='accent'
|
color='accent'
|
||||||
filled
|
filled
|
||||||
onClick={handleFavouriteClick}
|
onClick={handleFavouriteClick}
|
||||||
|
|
|
@ -37,7 +37,7 @@ const messages = defineMessages({
|
||||||
});
|
});
|
||||||
|
|
||||||
const icons = {
|
const icons = {
|
||||||
favourite: require('@tabler/icons/outline/heart.svg'),
|
favourite: require('@tabler/icons/outline/star.svg'),
|
||||||
reblog: require('@tabler/icons/outline/repeat.svg'),
|
reblog: require('@tabler/icons/outline/repeat.svg'),
|
||||||
reply: require('@tabler/icons/outline/corner-up-left.svg'),
|
reply: require('@tabler/icons/outline/corner-up-left.svg'),
|
||||||
};
|
};
|
||||||
|
|
|
@ -66,7 +66,7 @@ const NotificationFilterBar = () => {
|
||||||
name: 'status',
|
name: 'status',
|
||||||
});
|
});
|
||||||
items.push({
|
items.push({
|
||||||
text: <Icon className='size-4' src={require('@tabler/icons/outline/heart.svg')} />,
|
text: <Icon className='size-4' src={require('@tabler/icons/outline/star.svg')} />,
|
||||||
title: intl.formatMessage(messages.favourites),
|
title: intl.formatMessage(messages.favourites),
|
||||||
action: onClick('favourite'),
|
action: onClick('favourite'),
|
||||||
name: 'favourite',
|
name: 'favourite',
|
||||||
|
|
|
@ -52,7 +52,7 @@ const icons: Partial<Record<NotificationType | 'reply', string>> = {
|
||||||
follow: require('@tabler/icons/outline/user-plus.svg'),
|
follow: require('@tabler/icons/outline/user-plus.svg'),
|
||||||
follow_request: require('@tabler/icons/outline/user-plus.svg'),
|
follow_request: require('@tabler/icons/outline/user-plus.svg'),
|
||||||
mention: require('@tabler/icons/outline/at.svg'),
|
mention: require('@tabler/icons/outline/at.svg'),
|
||||||
favourite: require('@tabler/icons/outline/heart.svg'),
|
favourite: require('@tabler/icons/outline/star.svg'),
|
||||||
reblog: require('@tabler/icons/outline/repeat.svg'),
|
reblog: require('@tabler/icons/outline/repeat.svg'),
|
||||||
status: require('@tabler/icons/outline/bell-ringing.svg'),
|
status: require('@tabler/icons/outline/bell-ringing.svg'),
|
||||||
poll: require('@tabler/icons/outline/chart-bar.svg'),
|
poll: require('@tabler/icons/outline/chart-bar.svg'),
|
||||||
|
|
|
@ -35,7 +35,7 @@ const settingsSchema = v.object({
|
||||||
preserveSpoilers: v.fallback(v.boolean(), false),
|
preserveSpoilers: v.fallback(v.boolean(), false),
|
||||||
autoTranslate: v.fallback(v.boolean(), false),
|
autoTranslate: v.fallback(v.boolean(), false),
|
||||||
knownLanguages: v.fallback(v.array(v.string()), []),
|
knownLanguages: v.fallback(v.array(v.string()), []),
|
||||||
showWrenchButton: v.fallback(v.boolean(), true),
|
showWrenchButton: v.fallback(v.boolean(), false),
|
||||||
|
|
||||||
systemFont: v.fallback(v.boolean(), false),
|
systemFont: v.fallback(v.boolean(), false),
|
||||||
demetricator: v.fallback(v.boolean(), false),
|
demetricator: v.fallback(v.boolean(), false),
|
||||||
|
|
Loading…
Reference in a new issue