A platform for community discussion. Free, open, simple.
DEV: move mobile form-kit CSS to common directory (#39053)
Kris2048952958ca
diff --git a/app/assets/stylesheets/common/form-kit/_control-menu.scss b/app/assets/stylesheets/common/form-kit/_control-menu.scssindex d9cf41454ca..89199ca33dc 100644--- a/app/assets/stylesheets/common/form-kit/_control-menu.scss+++ b/app/assets/stylesheets/common/form-kit/_control-menu.scss@@ -1,18 +1,43 @@-.form-kit__control-menu-trigger {- justify-content: space-between;+@use "lib/viewport";- @include default-input;- width: auto;-}+.form-kit__control-menu {+ @include viewport.until(sm) {+ justify-content: space-between;+ min-width: var(--form-kit-small-input);+ }++ &-trigger {+ justify-content: space-between;-.form-kit__control-menu-content {- .dropdown-menu {- min-width: 200px;+ @include default-input;+ width: auto;}- .dropdown-menu__item {- &:hover {- background: var(--d-hover);+ &-content {+ .dropdown-menu {+ min-width: 200px;+ }++ .dropdown-menu__item {+ &:hover {+ background: var(--d-hover);+ }+ }+ }++ @include viewport.until(sm) {+ &-item {+ .btn:focus,+ .btn:active {+ .discourse-touch & {+ color: var(--primary);+ background: rgb(0, 0, 0, 0);+ }+ }++ &:last-of-type .btn {+ color: var(--tertiary);+ }}}}diff --git a/app/assets/stylesheets/common/form-kit/_field.scss b/app/assets/stylesheets/common/form-kit/_field.scssindex 458a8167099..5765b7f75f9 100644--- a/app/assets/stylesheets/common/form-kit/_field.scss+++ b/app/assets/stylesheets/common/form-kit/_field.scss@@ -1,3 +1,5 @@+@use "lib/viewport";+.form-kit__field {.form-kit__container-content {align-items: flex-start;@@ -5,6 +7,13 @@width: var(--form-kit-medium-input);}+ @include viewport.until(sm) {+ .form-kit__container-content,+ .form-kit__container {+ width: 100% !important;+ }+ }+&.--full {width: 100%;}diff --git a/app/assets/stylesheets/common/form-kit/_row.scss b/app/assets/stylesheets/common/form-kit/_row.scssindex f14a230d0a0..df1593317ab 100644--- a/app/assets/stylesheets/common/form-kit/_row.scss+++ b/app/assets/stylesheets/common/form-kit/_row.scss@@ -1,3 +1,5 @@+@use "lib/viewport";+.form-kit__row {display: flex;flex-wrap: wrap;@@ -26,7 +28,11 @@}.form-kit__button {- height: 2em;+ height: 2.25em;++ @include viewport.from(sm) {+ height: 2em;+ }}.form-kit__container-title {diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scssindex 222214190dd..3a4859755ad 100644--- a/app/assets/stylesheets/mobile.scss+++ b/app/assets/stylesheets/mobile.scss@@ -1,3 +1,2 @@// Import all component-specific files@import "mobile/select-kit/_index";-@import "mobile/form-kit/_index";diff --git a/app/assets/stylesheets/mobile/form-kit/_control-input.scss b/app/assets/stylesheets/mobile/form-kit/_control-input.scssdeleted file mode 100644index d64c1506f39..00000000000--- a/app/assets/stylesheets/mobile/form-kit/_control-input.scss+++ /dev/null@@ -1,4 +0,0 @@-.form-kit__before-input,-.form-kit__after-input {- height: 2.25em;-}diff --git a/app/assets/stylesheets/mobile/form-kit/_control-menu.scss b/app/assets/stylesheets/mobile/form-kit/_control-menu.scssdeleted file mode 100644index af7005fda98..00000000000--- a/app/assets/stylesheets/mobile/form-kit/_control-menu.scss+++ /dev/null@@ -1,20 +0,0 @@-.form-kit {- &__control-menu {- justify-content: space-between;- min-width: var(--form-kit-small-input);- }-- &__control-menu-item {- .btn:focus,- .btn:active {- .discourse-touch & {- color: var(--primary);- background: rgb(0, 0, 0, 0);- }- }-- &:last-of-type .btn {- color: var(--tertiary);- }- }-}diff --git a/app/assets/stylesheets/mobile/form-kit/_control-text.scss b/app/assets/stylesheets/mobile/form-kit/_control-text.scssdeleted file mode 100644index 2386799a662..00000000000--- a/app/assets/stylesheets/mobile/form-kit/_control-text.scss+++ /dev/null@@ -1,3 +0,0 @@-.form-kit__control-text {- height: 150px;-}diff --git a/app/assets/stylesheets/mobile/form-kit/_field.scss b/app/assets/stylesheets/mobile/form-kit/_field.scssdeleted file mode 100644index eb47a6fd708..00000000000--- a/app/assets/stylesheets/mobile/form-kit/_field.scss+++ /dev/null@@ -1,4 +0,0 @@-.form-kit__field .form-kit__container-content,-.form-kit__container {- width: 100% !important;-}diff --git a/app/assets/stylesheets/mobile/form-kit/_index.scss b/app/assets/stylesheets/mobile/form-kit/_index.scssdeleted file mode 100644index 68a507a61ee..00000000000--- a/app/assets/stylesheets/mobile/form-kit/_index.scss+++ /dev/null@@ -1,5 +0,0 @@-@import "_control-input";-@import "_control-menu";-@import "_control-text";-@import "_field";-@import "_row";diff --git a/app/assets/stylesheets/mobile/form-kit/_row.scss b/app/assets/stylesheets/mobile/form-kit/_row.scssdeleted file mode 100644index 47a11f59791..00000000000--- a/app/assets/stylesheets/mobile/form-kit/_row.scss+++ /dev/null@@ -1,5 +0,0 @@-.form-kit__row {- .form-kit__button {- height: 2.25em;- }-}