diff --git a/app/soapbox/actions/interactions.js b/app/soapbox/actions/interactions.js index aaa6b61437..1e2d729f17 100644 Binary files a/app/soapbox/actions/interactions.js and b/app/soapbox/actions/interactions.js differ diff --git a/app/soapbox/components/account.js b/app/soapbox/components/account.js index c23c0420e1..d4b616d5d9 100644 Binary files a/app/soapbox/components/account.js and b/app/soapbox/components/account.js differ diff --git a/app/soapbox/components/column_back_button.js b/app/soapbox/components/column_back_button.js index 1ce0d8f1fe..bbc2fc701c 100644 Binary files a/app/soapbox/components/column_back_button.js and b/app/soapbox/components/column_back_button.js differ diff --git a/app/soapbox/features/reactions/index.js b/app/soapbox/features/reactions/index.js new file mode 100644 index 0000000000..260c8726b1 Binary files /dev/null and b/app/soapbox/features/reactions/index.js differ diff --git a/app/soapbox/features/status/components/status_interaction_bar.js b/app/soapbox/features/status/components/status_interaction_bar.js index d921efca08..fbd943a634 100644 Binary files a/app/soapbox/features/status/components/status_interaction_bar.js and b/app/soapbox/features/status/components/status_interaction_bar.js differ diff --git a/app/soapbox/features/ui/components/column.js b/app/soapbox/features/ui/components/column.js index 5f31399e3e..e915e5e709 100644 Binary files a/app/soapbox/features/ui/components/column.js and b/app/soapbox/features/ui/components/column.js differ diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js index 010242b0db..c6136f69be 100644 Binary files a/app/soapbox/features/ui/index.js and b/app/soapbox/features/ui/index.js differ diff --git a/app/soapbox/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js index 1fe50212c2..61f6c21430 100644 Binary files a/app/soapbox/features/ui/util/async-components.js and b/app/soapbox/features/ui/util/async-components.js differ diff --git a/app/soapbox/reducers/__tests__/user_lists-test.js b/app/soapbox/reducers/__tests__/user_lists-test.js index feaaca3e67..7d571e2080 100644 Binary files a/app/soapbox/reducers/__tests__/user_lists-test.js and b/app/soapbox/reducers/__tests__/user_lists-test.js differ diff --git a/app/soapbox/reducers/user_lists.js b/app/soapbox/reducers/user_lists.js index 9afaf55b9d..f0d80de778 100644 Binary files a/app/soapbox/reducers/user_lists.js and b/app/soapbox/reducers/user_lists.js differ diff --git a/app/styles/accounts.scss b/app/styles/accounts.scss index ad2190be5a..14f74f59ae 100644 --- a/app/styles/accounts.scss +++ b/app/styles/accounts.scss @@ -216,6 +216,13 @@ .account__avatar-wrapper { float: left; margin-right: 12px; + + .emoji-react__emoji { + position: absolute; + top: 36px; + left: 32px; + z-index: 1; + } } .account__avatar { diff --git a/app/styles/components/emoji-reacts.scss b/app/styles/components/emoji-reacts.scss index 4fca2108c3..bc69b05423 100644 --- a/app/styles/components/emoji-reacts.scss +++ b/app/styles/components/emoji-reacts.scss @@ -1,6 +1,8 @@ .emoji-react { display: inline-block; transition: 0.1s; + color: var(--primary-text-color--faint); + text-decoration: none; &__emoji { img { @@ -20,8 +22,6 @@ } .emoji-react--reblogs { - color: var(--primary-text-color--faint); - text-decoration: none; vertical-align: middle; display: inline-flex; diff --git a/app/styles/ui.scss b/app/styles/ui.scss index bf8dd9f7ef..72c55a6bd7 100644 --- a/app/styles/ui.scss +++ b/app/styles/ui.scss @@ -611,7 +611,8 @@ .notification__filter-bar, .search__filter-bar, -.account__section-headline { +.account__section-headline, +.reaction__filter-bar { border-bottom: 1px solid var(--brand-color--faint); cursor: default; display: flex; @@ -661,6 +662,17 @@ } } +.reaction__filter-bar { + overflow-x: auto; + overflow-y: hidden; + + a { + flex: unset; + padding: 15px 24px; + min-width: max-content; + } +} + ::-webkit-scrollbar-thumb { border-radius: 0; }