Skip to content

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

UX: simplify embedded post styles (#38429)

Kris0f48c48ad8b9
diff --git a/app/assets/stylesheets/common/base/embedded-posts.scss b/app/assets/stylesheets/common/base/embedded-posts.scss
index 615722c678e..c6d17e1e0b6 100644
--- a/app/assets/stylesheets/common/base/embedded-posts.scss
+++ b/app/assets/stylesheets/common/base/embedded-posts.scss
@@ -2,6 +2,9 @@
// nested replies in topics
.embedded-posts {
+ --border-color: var(--content-border-color);
+ --border-width: 1px;
+
@include viewport.until(sm) {
position: relative;
padding: 0.75em 0.5em 0.75em 0;
@@ -9,13 +12,7 @@
margin-left: 0;
}
- @include viewport.from(sm) {
- border: 1px solid var(--content-border-color);
- }
-
.collapse-up {
- color: var(--primary-high);
- background: var(--primary-low);
z-index: 1;
.archetype-private_message & {
@@ -24,27 +21,11 @@
@include viewport.until(sm) {
position: relative;
- padding: 6px;
transform: translate(25%, -30%);
- box-shadow: 0 0 0 1px var(--primary-300);
-
- .d-icon {
- transform: scale(0.871);
- }
-
- &:hover,
- &:focus {
- background: var(--primary-300);
-
- .d-icon {
- color: var(--primary);
- }
- }
}
@include viewport.from(sm) {
transform: translate(-50%, -164%);
- border: 1px solid var(--primary-300);
padding: var(--space-2);
left: 32px;
bottom: calc(-1 * var(--space-12));
@@ -67,7 +48,7 @@
top: calc(-2px - 0.75em);
width: 1px;
height: calc(100% + 1.5em + 5px);
- background: var(--primary-300);
+ background: var(--border-color);
left: 24px;
}
}
@@ -112,7 +93,7 @@
.post-info.arrow {
padding: 0.5em 0;
margin-right: 0;
- color: var(--primary-med-or-secondary-high);
+ color: var(--primary-medium);
line-height: 1;
&:hover,
@@ -164,25 +145,7 @@
.collapse-up {
position: absolute;
color: var(--primary-medium);
- background: var(--secondary);
- border: 1px solid var(--content-border-color);
- padding: 6px 9px 8px;
z-index: 99; // Needs to be higher than topic-avatar
-
- .d-icon {
- color: currentcolor;
- }
-
- .discourse-no-touch & {
- &:hover {
- background: var(--primary-low);
- color: var(--primary-high);
-
- .d-icon {
- color: currentcolor;
- }
- }
- }
}
// bottom means "reply expansion" below a post
@@ -205,8 +168,8 @@
position: absolute;
top: calc(-1 * var(--space-6));
width: 1px;
- height: calc(100% + var(--space-5));
- background: var(--primary-300);
+ height: calc(100% + var(--space-3));
+ background: var(--border-color);
left: 32px;
}
}
@@ -220,9 +183,9 @@
content: "";
position: absolute;
top: calc(-1 * var(--space-6));
- width: 1px;
+ width: var(--border-width);
height: calc(100% + var(--space-6));
- background: var(--primary-300);
+ background: var(--border-color);
left: 32px;
}
@@ -241,7 +204,7 @@
.post-link-arrow {
position: absolute;
- bottom: var(--space-3);
+ bottom: var(--space-2);
.archetype-private_message & {
bottom: 0;
@@ -276,20 +239,6 @@
}
}
- .collapse-up {
- .d-icon {
- transform: scale(0.871);
- }
-
- .discourse-no-touch & {
- &:hover,
- &:focus {
- color: var(--primary);
- background: var(--primary-300);
- }
- }
- }
-
.load-more-replies {
font-size: var(--font-down-1);
position: absolute;
@@ -306,15 +255,19 @@
// top means "in reply to expansion" above a post
&.top {
margin-left: 0;
- border: none;
width: calc(
var(--topic-body-width) + (var(--topic-body-width-padding) * 2) +
var(--topic-avatar-width) - (var(--topic-avatar-width) + 2px)
); // 2px accounts for left and right borders
+ &.topic-body:first-of-type {
+ border-top: 1px solid var(--border-color);
+ }
+
.collapse-down {
transform: translate(17%, 230%);
z-index: 1;
+ margin-left: var(--border-width);
}
.row {
@@ -334,9 +287,9 @@
content: "";
position: absolute;
top: var(--space-6);
- width: 1px;
+ width: var(--border-width);
height: calc(100% + var(--space-6));
- background: var(--primary-300);
+ background: var(--border-color);
left: -22px;
}
}
@@ -380,3 +333,10 @@
}
}
}
+
+.replies-above > div:last-child {
+ .topic-avatar,
+ .topic-body {
+ border: none;
+ }
+}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 60e3934fa8f..6e37c0557bd 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -603,22 +603,26 @@ nav.post-controls {
}
.btn.show-replies {
+ --border-width: 1px;
font-size: inherit;
- padding: 10px;
color: var(--primary-medium);
display: flex;
align-items: center;
border-radius: var(--d-button-border-radius);
- @include viewport.until(sm) {
- padding: 9px;
+ &[aria-expanded="true"] {
+ background: var(--primary-low);
+ color: var(--primary-high);
+ z-index: 1;
- &[aria-expanded="true"] {
- background: var(--primary-low);
+ .d-icon {
color: var(--primary-high);
- box-shadow: 0 0 0 1px var(--primary-300);
- z-index: 1;
- margin-left: 1px;
+ }
+ }
+
+ .discourse-no-touch & {
+ &:hover {
+ color: var(--primary);
.d-icon {
color: var(--primary-high);
@@ -627,38 +631,11 @@ nav.post-controls {
}
@include viewport.from(sm) {
- margin-left: 0;
white-space: nowrap;
.topic-post & {
margin-right: var(--space-2);
}
-
- &[aria-expanded="true"] {
- background: var(--primary-low);
- color: var(--primary-high);
- box-shadow: 0 0 0 1px var(--primary-300);
- z-index: 1;
-
- .d-icon {
- color: var(--primary-high);
- }
-
- &:hover,
- &:focus {
- background: var(--primary-300);
- color: var(--primary);
- }
- }
- }
-
- .discourse-no-touch & {
- &:hover,
- &:focus-visible {
- outline: none;
- color: var(--d-post-control-text-color--hover);
- background: var(--d-post-control-background--hover);
- }
}
.d-icon {
diff --git a/frontend/discourse/app/components/post.gjs b/frontend/discourse/app/components/post.gjs
index b1a4cf41855..6fccc3543c9 100644
--- a/frontend/discourse/app/components/post.gjs
+++ b/frontend/discourse/app/components/post.gjs
@@ -496,7 +496,7 @@ export default class Post extends Component {
class="post__embedded-posts post__embedded-posts--top post__body embedded-posts top topic-body"
>
<DButton
- class="post__collapse-button post__collapse-button-down collapse-down"
+ class="btn-default btn-small post__collapse-button post__collapse-button-down collapse-down"
@action={{this.toggleReplyAbove}}
@icon="chevron-down"
@title="post.collapse"
@@ -660,7 +660,7 @@ export default class Post extends Component {
{{/each}}
<DButton
- class="post__collapse-button post__collapse-button-up collapse-up"
+ class="btn-default btn-small post__collapse-button post__collapse-button-up collapse-up"
@action={{this.toggleRepliesBelow}}
@ariaLabel="post.sr_collapse_replies"
@icon="chevron-up"