Skip to content

A platform for community discussion. Free, open, simple.

DEV: move mobile select-kit CSS to common files (#39055)

Kris70f9794cfb42
diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index d698e207bcc..573a31fc336 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -1,3 +1,5 @@
+@use "lib/viewport";
+
.select-kit {
&.combo-box {
&.category-drop {
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index 948baed0454..75cd8531831 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -1,3 +1,5 @@
+@use "lib/viewport";
+
.select-kit {
&.single-select {
&.dropdown-select-box {
@@ -43,9 +45,13 @@
font-size: var(--font-0);
color: var(--primary);
padding: 0;
+ max-width: 100%;
@include ellipsis;
- max-width: 100%;
+
+ @include viewport.until(sm) {
+ font-weight: normal;
+ }
}
.desc {
@@ -56,11 +62,22 @@
white-space: normal;
}
}
+
+ @include viewport.until(sm) {
+ .svg-icon-title {
+ width: auto;
+ height: auto;
+ }
+ }
}
.select-kit-collection {
padding: 0;
max-height: 100%;
+
+ @include viewport.until(sm) {
+ overflow-y: auto;
+ }
}
.select-kit-header {
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 98963a17785..686494e1549 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -1,3 +1,5 @@
+@use "lib/viewport";
+
.select-kit {
@include unselectable;
border: none;
@@ -210,6 +212,10 @@
justify-content: flex-start;
padding: 0.5em;
+ @include viewport.until(sm) {
+ padding-block: 0.75em;
+ }
+
&.disabled {
pointer-events: none;
opacity: 0.4;
@@ -311,6 +317,10 @@
width: 100%;
box-sizing: border-box;
min-height: 30px;
+
+ @include viewport.until(sm) {
+ font-size: var(--font-0);
+ }
}
&.is-hidden {
diff --git a/app/assets/stylesheets/common/select-kit/tag-drop.scss b/app/assets/stylesheets/common/select-kit/tag-drop.scss
index 835edb7598b..a66c958f004 100644
--- a/app/assets/stylesheets/common/select-kit/tag-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/tag-drop.scss
@@ -1,3 +1,5 @@
+@use "lib/viewport";
+
.select-kit {
&.combo-box {
&.tag-drop {
@@ -8,12 +10,26 @@
color: var(--primary-high);
}
+ @include viewport.until(sm) {
+ .tag-drop-header {
+ font-size: var(--font-0);
+
+ .d-icon {
+ font-size: var(--font-0);
+ }
+ }
+ }
+
.select-kit-row {
&[data-value="all-tags"],
&[data-value="no-tags"] {
color: var(--tertiary);
font-weight: 700;
}
+
+ @include viewport.until(sm) {
+ font-weight: normal;
+ }
}
.angle-icon {
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index 3a4859755ad..d88bbbc645d 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -1,2 +1,3 @@
-// Import all component-specific files
-@import "mobile/select-kit/_index";
+// This file intentionally left blank — the stylesheet compiler generates `@import "mobile"`
+// Plugins and themes can still add mobile styles for import
+// Instead of authoring mobile-specific styles, use media queries in the common stylesheets
diff --git a/app/assets/stylesheets/mobile/select-kit/_index.scss b/app/assets/stylesheets/mobile/select-kit/_index.scss
deleted file mode 100644
index 2327d21b0fc..00000000000
--- a/app/assets/stylesheets/mobile/select-kit/_index.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import "category-drop";
-@import "dropdown-select-box";
-@import "select-kit";
-@import "tag-drop";
diff --git a/app/assets/stylesheets/mobile/select-kit/category-drop.scss b/app/assets/stylesheets/mobile/select-kit/category-drop.scss
deleted file mode 100644
index ecbc186a095..00000000000
--- a/app/assets/stylesheets/mobile/select-kit/category-drop.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-.select-kit {
- &.combo-box {
- &.category-drop {
- .category-drop-header {
- font-size: var(--font-0);
-
- .d-icon {
- font-size: var(--font-0);
- }
- }
-
- .select-kit-row {
- font-weight: normal;
- }
-
- .category-name {
- max-width: 70vw;
- }
- }
- }
-}
diff --git a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
deleted file mode 100644
index 57ed8327cce..00000000000
--- a/app/assets/stylesheets/mobile/select-kit/dropdown-select-box.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.select-kit {
- &.dropdown-select-box {
- .select-kit-collection {
- overflow-y: auto;
- }
-
- .select-kit-row {
- .svg-icon-title {
- width: auto;
- height: auto;
- }
-
- .texts {
- .name {
- font-weight: normal;
- }
- }
- }
- }
-}
diff --git a/app/assets/stylesheets/mobile/select-kit/select-kit.scss b/app/assets/stylesheets/mobile/select-kit/select-kit.scss
deleted file mode 100644
index 38a9d9d68f1..00000000000
--- a/app/assets/stylesheets/mobile/select-kit/select-kit.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-.select-kit {
- &.is-expanded {
- z-index: z("dropdown");
- }
-
- .select-kit-filter {
- .filter-input {
- font-size: 16px;
- }
- }
-
- .select-kit-row {
- padding: 0.75em 0.5em;
- }
-}
diff --git a/app/assets/stylesheets/mobile/select-kit/tag-drop.scss b/app/assets/stylesheets/mobile/select-kit/tag-drop.scss
deleted file mode 100644
index 36c23e8537f..00000000000
--- a/app/assets/stylesheets/mobile/select-kit/tag-drop.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.select-kit {
- &.combo-box {
- &.tag-drop {
- .tag-drop-header {
- font-size: var(--font-0);
-
- .d-icon {
- font-size: var(--font-0);
- }
- }
-
- .select-kit-row {
- font-weight: normal;
- }
- }
- }
-}
diff --git a/spec/lib/stylesheet/compiler_spec.rb b/spec/lib/stylesheet/compiler_spec.rb
index 44de9279eed..84a383c0f17 100644
--- a/spec/lib/stylesheet/compiler_spec.rb
+++ b/spec/lib/stylesheet/compiler_spec.rb
@@ -9,6 +9,9 @@ RSpec.describe Stylesheet::Compiler do
path = File.basename(path, ".scss")
+ # mobile.scss and mobile_rtl.scss are intentionally empty stubs
+ next if path.start_with?("mobile")
+
it "can compile '#{path}' css" do
css, _map = Stylesheet::Compiler.compile_asset(path)
expect(css.length).to be > 500