diff --git a/app/javascript/mastodon/features/reaction_deck/index.jsx b/app/javascript/mastodon/features/reaction_deck/index.jsx index b1bc4ccfb9..b7fe24d2fa 100644 --- a/app/javascript/mastodon/features/reaction_deck/index.jsx +++ b/app/javascript/mastodon/features/reaction_deck/index.jsx @@ -16,6 +16,7 @@ import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd'; import { updateReactionDeck } from 'mastodon/actions/reaction_deck'; import Button from 'mastodon/components/button'; import ColumnHeader from 'mastodon/components/column_header'; +import { Icon } from 'mastodon/components/icon'; import LoadingIndicator from 'mastodon/components/loading_indicator'; import ScrollableList from 'mastodon/components/scrollable_list'; import Column from 'mastodon/features/ui/components/column'; @@ -129,16 +130,18 @@ class ReactionDeck extends ImmutablePureComponent { {(provided) => ( -
+
{deck.map((emoji, index) => ( {(provided2) => ( -
+
+
)} diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 5dddda6e0c..ac9312bb82 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -7544,11 +7544,25 @@ noscript { } } +.reaction_deck_container { + &__row { + display: flex; + height: 32px; + margin: 8px 16px 12px 4px; + + .handle { + font-size: 24px; + } + + .reaction_deck__emoji { + flex: 1; + } + } +} + .reaction_deck__emoji { &__wrapper { display: flex; - margin: 8px 16px 8px 4px; - height: 32px; .emojione { min-width: 24px;