Skip to content

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

DEV: merge desktop topic.scss into common topic.scss (#39305)

Kris9ceb500ddd5d
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 9dece456460..9f946b9972a 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -330,6 +330,15 @@
width: 100%;
gap: 0.5em;
}
+
+ @include viewport.from(sm) {
+ .remove-featured-link {
+ float: right;
+ text-transform: lowercase;
+ color: var(--primary-med-or-secondary-med);
+ font-size: 0.857rem;
+ }
+ }
}
.private-message-glyph {
@@ -539,3 +548,25 @@ a[data-clicks]::after {
}
}
}
+
+@include viewport.from(sm) {
+ .post-menu-area {
+ position: relative;
+ padding-left: var(--topic-body-width-padding);
+ margin: 20px 0;
+ }
+
+ #topic-filter {
+ background-color: var(--highlight-bg);
+ padding: 8px;
+ bottom: 0;
+ position: fixed;
+ width: 100%;
+ font-size: var(--font-0);
+ z-index: z("dropdown");
+ }
+
+ .onscreen-post .row {
+ display: flex; // children should never wrap
+ }
+}
diff --git a/app/assets/stylesheets/desktop/_index.scss b/app/assets/stylesheets/desktop/_index.scss
index 1cb78e2708d..e39c1026480 100644
--- a/app/assets/stylesheets/desktop/_index.scss
+++ b/app/assets/stylesheets/desktop/_index.scss
@@ -1,2 +1 @@
@import "category-list";
-@import "topic";
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
deleted file mode 100644
index e2b53fb4419..00000000000
--- a/app/assets/stylesheets/desktop/topic.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-.post-menu-area {
- position: relative;
- padding-left: var(--topic-body-width-padding);
- margin: 20px 0;
-}
-
-#topic-title {
- .remove-featured-link {
- float: right;
- text-transform: lowercase;
- color: var(--primary-med-or-secondary-med);
- font-size: 0.857rem;
- }
-}
-
-#topic-filter {
- background-color: var(--highlight-bg);
- padding: 8px;
- bottom: 0;
- position: fixed;
- width: 100%;
- font-size: var(--font-0);
- z-index: z("dropdown");
-}
-
-.onscreen-post .row {
- display: flex; // children should never wrap
-}