A platform for community discussion. Free, open, simple.
UX: consistent "more emoji" icon, fix reactions styles in modernized foundation (#40126)
Kris41168dbd0870
diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scssindex 05b9ad08c36..155b115de76 100644--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss@@ -39,7 +39,8 @@.back-button,.composer-actions-btn,.language-switcher-trigger,- .d-multi-select-trigger__expand-btn+ .d-multi-select-trigger__expand-btn,+ .emoji-picker-trigger) {padding-block: 0;height: var(--d-control-height);@@ -55,7 +56,8 @@.user-menu-tab-active,.composer-actions-btn,.dropdown-select-box-header,- .d-multi-select-trigger__expand-btn+ .d-multi-select-trigger__expand-btn,+ .emoji-picker-trigger) {width: var(--d-control-height);}diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-picker.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-picker.gjsindex 002878ed5f5..d91145c474d 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-picker.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-picker.gjs@@ -184,7 +184,7 @@ export default class DiscourseReactionsPicker extends Component {{{#if this.siteSettings.discourse_reactions_allow_any_emoji}}<EmojiPicker...attributes- @icon="far-face-smile"+ @icon="discourse-emojis"@context="discourse-reactions"@didSelectEmoji={{this.onSelectEmoji}}@onShow={{this.preventCollapse}}diff --git a/plugins/discourse-reactions/assets/stylesheets/common/discourse-reactions.scss b/plugins/discourse-reactions/assets/stylesheets/common/discourse-reactions.scssindex 05df245ce07..dd7b60ab7b3 100644--- a/plugins/discourse-reactions/assets/stylesheets/common/discourse-reactions.scss+++ b/plugins/discourse-reactions/assets/stylesheets/common/discourse-reactions.scss@@ -286,6 +286,15 @@ html.discourse-reactions-no-select {display: grid;gap: 0.25em;+ .emoji-picker-trigger {+ gap: 0;++ .d-icon {+ width: 1.25em;+ height: 1.25em;+ }+ }+@for $i from 1 through 8 {&.col-#{$i} {grid-template-columns: repeat($i, 1fr);@@ -299,7 +308,7 @@ html.discourse-reactions-no-select {margin: 0.25em !important;border: 1px solid transparent !important;cursor: not-allowed;- border-radius: 8px;+ border-radius: var(--d-border-radius);.emoji {pointer-events: none;@@ -324,7 +333,8 @@ html.discourse-reactions-no-select {}&.is-used {- border-color: var(--tertiary-low) !important;+ border-color: var(--d-selected) !important;+ background-color: var(--d-selected);}}}