Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UX: Merge the redesign experiment for embedded replies #26876

Merged
merged 4 commits into from
May 8, 2024
Merged

UX: Merge the redesign experiment for embedded replies #26876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2bb5f5
UX: Merge the redesign experiment for embedded replies
jancernik May 6, 2024
eeab045
Format
jancernik May 6, 2024
65ac031
FIX: Remove 2nd line of margin-left styles
jordanvidrine May 6, 2024
4ba6d98
apply sticky avatar only on top level topic avatar
jjaffeux May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/assets/javascripts/discourse/app/widgets/embedded-post.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ createWidget("post-link-arrow", {
tagName: "div.post-link-arrow",

template: hbs`
<a href={{attrs.shareUrl}} class="post-info arrow" title={{i18n "topic.jump_reply"}} aria-label={{i18n
<a href={{attrs.shareUrl}} class="post-info arrow" title={{i18n "topic.jump_reply"}} aria-label={{i18n
"topic.jump_reply_aria" username=attrs.name
}}>
{{#if attrs.above}}
{{d-icon "arrow-up"}}
{{else}}
{{d-icon "arrow-down"}}
{{/if}}
{{i18n "topic.jump_reply_button"}}
</a>
`,
});
Expand Down
176 changes: 149 additions & 27 deletions app/assets/stylesheets/desktop/topic-post.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,31 @@ nav.post-controls {
}
}
.show-replies {
margin-left: calc(
var(--topic-body-width-padding) * -1
); // negates padding-left on .cooked, for visual alignment
display: flex;
align-items: center;
margin-left: 0;
border-radius: var(--d-button-border-radius);
.topic-post & {
margin-right: 0.5em;
}
white-space: nowrap;
.d-icon {
margin-right: var(--control-icon-space);
margin-inline: var(--control-icon-space);
margin-left: 0;
}
&[aria-expanded="true"] {
background: var(--primary-low);
color: var(--primary-high);
box-shadow: 0px 0px 0px 1px var(--primary-300);
z-index: 1;
.d-icon {
color: var(--primary-high);
}
&:hover,
&:focus {
background: var(--primary-300);
color: var(--primary);
}
}
}
}
Expand Down Expand Up @@ -175,42 +195,144 @@ pre.codeblock-buttons:hover {
}
}
}
} // bottom means "reply expansion" below a post
&.bottom {
border-top: none;
margin-bottom: 20px;
&.hidden {
display: block;
opacity: 0;
}
}

// bottom means "reply expansion" below a post
&.bottom {
position: relative;
max-width: calc(100% - 66px);
margin-bottom: 30px;
border: none;
> div {
position: relative;
margin-bottom: 1.5em;
&:last-of-type {
margin-bottom: 0;
.row {
// Main reply line
&:before {
content: "";
position: absolute;
top: -22px;
width: 1px;
height: calc(100% + 1.25em);
background: var(--primary-300);
left: 32px;
}
}
}
.row {
padding-bottom: 0.5em;
// Main reply line
&:before {
content: "";
position: absolute;
top: -22px;
width: 1px;
height: calc(100% + 1.5em);
background: var(--primary-300);
left: 32px;
}
.topic-avatar {
border-top: none;
padding-left: 9px;
position: relative;
}
.topic-body {
border-top: none;
padding-bottom: 2.5em;
.topic-meta-data {
position: unset;
.post-link-arrow {
position: absolute;
bottom: 0.75em;
.archetype-private_message & {
bottom: 0;
}
.post-info.arrow {
display: block;
margin-right: 0;
.d-icon {
margin-left: 0;
}
&:hover,
&:focus {
color: var(--primary-high);
}
}
}
}
.cooked {
margin-top: 0.25em;
padding-top: 0.5em;
}
}
}
&.hidden {
display: block;
opacity: 0;
}
}
.collapse-up {
transform: translate(-50%, -164%);
}
.row {
padding-bottom: 0.5em;
.topic-avatar,
.topic-body {
border-top: 1px solid var(--primary-low);
background: var(--primary-low);
color: var(--primary-high);
border: 1px solid var(--primary-300);
padding: 6px;
left: 32px;
bottom: -3em;
z-index: 1;
.archetype-private_message & {
display: flex;
}
.d-icon {
transform: scale(0.871);
}
.discourse-no-touch & {
&:hover,
&:focus {
color: var(--primary);
background: var(--primary-300);
}
}
}
} // top means "in reply to expansion" above a post

.topic-avatar {
padding-left: 1em;
}
}

// top means "in reply to expansion" above a post
&.top {
border-bottom: none;
margin-left: 0px;
border: none;
.collapse-down {
transform: translate(-50%, 55%);
transform: translate(17%, 230%);
z-index: 1;
}
margin-left: var(--topic-avatar-width);
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
.row {
border-bottom: none;
.topic-avatar,
.topic-body,
.topic-avatar {
border-top: none;
}
.topic-avatar {
padding-left: 0;
}
.topic-body {
border-top: 1px solid var(--primary-low);
overflow: visible;
&::before {
content: "";
position: absolute;
top: 16px;
width: 1px;
height: calc(100% + 1.5em);
background: var(--primary-300);
left: -22px;
}
}
}
}
Expand Down Expand Up @@ -503,7 +625,7 @@ blockquote {
}

.time-gap + .topic-post .embedded-posts.top {
border-bottom: 1px solid var(--primary-low);
border-bottom: none;
}

.posts-wrapper {
Expand Down Expand Up @@ -625,7 +747,7 @@ span.highlighted {
}

.topic-post.sticky-avatar {
.topic-avatar {
> article > .row > .topic-avatar {
position: sticky;
top: calc(var(--header-offset) - 0.25em);
margin-bottom: 25px;
Expand Down
116 changes: 114 additions & 2 deletions app/assets/stylesheets/mobile/topic-post.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,34 @@ nav.post-controls {
}
}
}

.show-replies {
display: flex;
align-items: center;
padding: 9px;
border-radius: var(--d-button-border-radius);

.d-icon {
padding-left: var(--control-space);
margin-left: 0 !important;
}
&[aria-expanded="true"] {
background: var(--primary-low);
color: var(--primary-high);
box-shadow: 0px 0px 0px 1px var(--primary-300);
z-index: 1;
margin-left: 1px;
.d-icon {
color: var(--primary-high);
}
&:hover,
&:focus {
color: var(--primary);
background: var(--primary-300);
}
}
}

&.replies-button-visible {
display: flex;
align-items: center;
Expand Down Expand Up @@ -102,8 +130,92 @@ nav.post-controls button.reply .d-icon {
}

.embedded-posts {
.topic-meta-data h5 a {
margin-left: 10px;
position: relative;
padding: 0.75em 0.5em 0.75em 0;
max-width: 100%;
margin-left: 0;
> div {
display: flex;
flex-direction: column;
justify-content: center;
position: relative;
margin-bottom: 1.5em;
.row {
// Main reply line
&:before {
content: "";
position: absolute;
top: calc(-2px - 0.75em);
width: 1px;
height: calc(100% + 1.5em + 5px);
background: var(--primary-300);
left: 24px;
}
}
.topic-avatar {
@include sticky;
top: calc(var(--header-offset) + 0.5em);
margin-right: 15px;
}
.topic-body {
display: flex;
flex-direction: column;
max-width: calc(100% - 32px);
margin-left: auto;
gap: 0.25em 0;
padding-bottom: 1.5em;
.topic-meta-data.embedded-reply {
margin-left: 0;
h5 a {
margin-left: 10px;
}
.names {
margin-bottom: 0.25em;
.user-title {
display: none;
}
.second {
flex-basis: auto;
}
}
.post-link-arrow {
position: absolute;
bottom: 0;
.post-info.arrow {
padding: 0.5em 0;
margin-right: 0;
color: var(--primary-med-or-secondary-high);
line-height: 1;
&:hover,
&:focus {
color: var(--primary-high);
}
}
}
}
}
}
.collapse-up {
position: relative;
padding: 6px;
color: var(--primary-high);
background: var(--primary-low);
z-index: 1;
transform: translate(25%, -30%);
box-shadow: 0px 0px 0px 1px var(--primary-300);
.archetype-private_message & {
display: flex;
}
.d-icon {
transform: scale(0.871);
}
&:hover,
&:focus {
background: var(--primary-300);
.d-icon {
color: var(--primary);
}
}
}
}

Expand Down
1 change: 1 addition & 0 deletions config/locales/client.en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3186,6 +3186,7 @@ en:
suggest_create_topic: Ready to <a href>start a new conversation?</a>
jump_reply: "Jump to post's original location"
jump_reply_aria: "Jump to @%{username}'s post in its original location"
jump_reply_button: "Jump to post"
deleted: "The topic has been deleted"

slow_mode_update:
Expand Down