A platform for community discussion. Free, open, simple.
DEV: move mobile emoji-picker styles into common file (#38983)
Kris4dcaa7ca990d
diff --git a/app/assets/stylesheets/common/components/emoji-picker.scss b/app/assets/stylesheets/common/components/emoji-picker.scssindex abb70341a0e..435110fe98f 100644--- a/app/assets/stylesheets/common/components/emoji-picker.scss+++ b/app/assets/stylesheets/common/components/emoji-picker.scss@@ -1,3 +1,5 @@+@use "lib/viewport";+.fk-d-menu[data-content][data-identifier="emoji-picker"] {z-index: z("modal", "dialog");@@ -24,6 +26,10 @@height: 300px;width: 500px;+ @include viewport.until(sm) {+ height: auto;+ }+.spinner-container {height: 100%;width: 100%;@@ -56,6 +62,10 @@background: var(--primary-very-low);display: flex;height: 50px;++ @include viewport.until(sm) {+ padding-top: 0.25rem;+ }}&__filter {@@ -83,6 +93,12 @@display: flex;flex-direction: row;height: 250px;++ @include viewport.until(sm) {+ flex-direction: column;+ padding-top: 1em;+ box-sizing: border-box;+ }}&__scrollable-content {@@ -113,6 +129,17 @@-ms-overflow-style: none; /* IE and Edge */scrollbar-width: none; /* Firefox */overscroll-behavior: contain;++ @include viewport.until(sm) {+ order: 1;+ height: 50px;+ width: 100%;+ flex-direction: row;+ display: flex;+ box-sizing: border-box;+ overflow-y: hidden;+ overflow-x: auto;+ }}&__sections-nav::-webkit-scrollbar {@@ -246,3 +273,38 @@align-items: center;}}++@include viewport.until(sm) {+ .fk-d-menu-modal.emoji-picker-content {+ // specificity is important for the styles in this container+ html:not(.keyboard-visible.mobile-view) & .d-modal__container {+ height: calc(var(--composer-vh, 1dvh) * 100);+ max-height: 100%;++ .emoji-picker__content {+ height: calc(+ var(--composer-vh, 1dvh) * 100 - 50px - env(safe-area-inset-bottom)+ );+ }+ }++ html.keyboard-visible.mobile-view & .d-modal__container {+ .emoji-picker__content {+ height: calc(var(--composer-vh, 1dvh) * 100 - 50px);+ }+ }++ .d-modal__body {+ padding: 0;+ }++ .d-modal__container {+ align-self: flex-start;+ }++ .emoji-picker__close-btn {+ margin-left: 0.25em;+ padding-left: 0.75em;+ }+ }+}diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scssindex aa940719ed8..0d7c60e6a0b 100644--- a/app/assets/stylesheets/mobile.scss+++ b/app/assets/stylesheets/mobile.scss@@ -1,5 +1,4 @@// Import all component-specific files-@import "mobile/components/_index";@import "mobile/select-kit/_index";@import "mobile/float-kit/_index";@import "mobile/form-kit/_index";diff --git a/app/assets/stylesheets/mobile/components/_index.scss b/app/assets/stylesheets/mobile/components/_index.scssdeleted file mode 100644index 7640dd17d44..00000000000--- a/app/assets/stylesheets/mobile/components/_index.scss+++ /dev/null@@ -1 +0,0 @@-@import "emoji-picker";diff --git a/app/assets/stylesheets/mobile/components/emoji-picker.scss b/app/assets/stylesheets/mobile/components/emoji-picker.scssdeleted file mode 100644index 8dabfa6b983..00000000000--- a/app/assets/stylesheets/mobile/components/emoji-picker.scss+++ /dev/null@@ -1,60 +0,0 @@-.fk-d-menu-modal.emoji-picker-content {- .emoji-picker {- height: auto;- }-- html:not(.keyboard-visible.mobile-view) & .d-modal__container {- height: calc(var(--composer-vh, 1dvh) * 100);- max-height: 100%;-- .emoji-picker__content {- height: calc(- var(--composer-vh, 1dvh) * 100 - 50px - env(safe-area-inset-bottom)- );- }- }-- html.keyboard-visible.mobile-view & .d-modal__container {- .emoji-picker__content {- height: calc(var(--composer-vh, 1dvh) * 100 - 50px);- }- }-- .d-modal__body {- padding: 0;- }-- .d-modal__container {- align-self: flex-start;- }-- .emoji-picker__sections-nav {- order: 1;- height: 50px;- width: 100%;- flex-direction: row;- display: flex;- box-sizing: border-box;- overflow-y: hidden;- overflow-x: auto;- }-- .emoji-picker__content {- flex-direction: column;- padding-top: 1em;- box-sizing: border-box;- }-- .emoji-picker__scrollable-content {- height: 100%;- }-- .emoji-picker__close-btn {- margin-left: 0.25em;- padding-left: 0.75em;- }-- .emoji-picker__filter-container {- padding-top: 0.25rem;- }-}