diff --git a/app/soapbox/features/status/components/status-interaction-bar.tsx b/app/soapbox/features/status/components/status-interaction-bar.tsx index 11bd0916a..2fdc4808d 100644 --- a/app/soapbox/features/status/components/status-interaction-bar.tsx +++ b/app/soapbox/features/status/components/status-interaction-bar.tsx @@ -5,11 +5,10 @@ import { FormattedNumber } from 'react-intl'; import { useDispatch } from 'react-redux'; import { openModal } from 'soapbox/actions/modals'; -import emojify from 'soapbox/features/emoji/emoji'; import { useAppSelector, useSoapboxConfig, useFeatures } from 'soapbox/hooks'; import { reduceEmoji } from 'soapbox/utils/emoji_reacts'; -import { HStack, IconButton, Text } from '../../../components/ui'; +import { HStack, IconButton, Text, Emoji } from '../../../components/ui'; import type { Status } from 'soapbox/types/entities'; @@ -135,39 +134,28 @@ const StatusInteractionBar: React.FC = ({ status }): JSX. if (count > 0) { return ( -
+
{emojiReacts.map((e, i) => { - const emojiReact = ( - <> - + - {e.get('count')} - + + + + ); - - if (features.exposableReactions) { - return ( - - {emojiReact} - - ); - } - - return {emojiReact}; })}
-
- {count} -
-
+ + + + + ); } diff --git a/app/styles/components/emoji-reacts.scss b/app/styles/components/emoji-reacts.scss index 082175985..ea825a895 100644 --- a/app/styles/components/emoji-reacts.scss +++ b/app/styles/components/emoji-reacts.scss @@ -1,5 +1,6 @@ .emoji-react { @apply inline-block text-gray-900 dark:text-gray-300 no-underline; + transition: 0.2s; &__emoji { img { @@ -13,7 +14,7 @@ } + .emoji-react { - margin-right: -8px; + @apply -mr-3; } &[type='button'] { @@ -64,7 +65,6 @@ .emoji-reacts-container { display: inline-flex; - margin-right: 0.4em; &:hover { .emoji-react { @@ -81,13 +81,6 @@ } } -.emoji-reacts__count, -.emoji-react__count { - font-size: 12px; - font-weight: bold; - transform: translateY(2px); -} - .emoji-react-selector-container { &:hover, &:focus {