Skip to content

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

UX: solved styling (#39180)

chapoi6f4c1f569d75
diff --git a/frontend/discourse/app/components/interpolated-translation.gjs b/frontend/discourse/app/components/interpolated-translation.gjs
index 8ddf51d8fff..fb5c452acaf 100644
--- a/frontend/discourse/app/components/interpolated-translation.gjs
+++ b/frontend/discourse/app/components/interpolated-translation.gjs
@@ -203,11 +203,17 @@ export default class InterpolatedTranslation extends Component {
* ```
*
* @param {String} name - The name of the placeholder this content should fill
+ * @param {String} [class] - Optional CSS class to apply to the placeholder's wrapper element
*/
class Placeholder extends Component {
constructor() {
super(...arguments);
this.args.markAsRendered(this.args.name);
+ if (this.args.class) {
+ this.args.elements
+ .get(this.args.name)
+ ?.forEach((el) => (el.className = this.args.class));
+ }
}
/**
diff --git a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accepted-answer.gjs b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accepted-answer.gjs
index c2162290841..26d67d30288 100644
--- a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accepted-answer.gjs
+++ b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accepted-answer.gjs
@@ -1,6 +1,5 @@
import Component from "@glimmer/component";
import { tracked } from "@glimmer/tracking";
-import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { service } from "@ember/service";
import { trustHTML } from "@ember/template";
@@ -8,6 +7,7 @@ import DButton from "discourse/components/d-button";
import InterpolatedTranslation from "discourse/components/interpolated-translation";
import PostCookedHtml from "discourse/components/post/cooked-html";
import UserLink from "discourse/components/user-link";
+import boundAvatarTemplate from "discourse/helpers/bound-avatar-template";
import concatClass from "discourse/helpers/concat-class";
import icon from "discourse/helpers/d-icon";
import { i18n } from "discourse-i18n";
@@ -100,7 +100,7 @@ export default class SolvedAcceptedAnswer extends Component {
{{#if this.acceptedAnswer}}
<aside
class={{concatClass
- "quote accepted-answer"
+ "quote accepted-answer d-solved-answer"
(if this.hasExcerpt "accepted-answer--has-excerpt")
(unless this.content "title-only")
}}
@@ -109,49 +109,14 @@ export default class SolvedAcceptedAnswer extends Component {
data-post={{this.acceptedAnswer.post_number}}
data-topic={{this.topic.id}}
>
- <div
- class="title"
- data-has-quote-controls="true"
- {{(if this.content (modifier on "click" this.onClickTitle))}}
- >
- <div class="accepted-answer--solver-accepter">
- <div class="accepted-answer--solver">
- {{#if this.showSolvedBy}}
- {{icon "square-check" class="accepted"}}
- <InterpolatedTranslation
- @key="solved.accepted_answer_solver_info"
- as |Placeholder|
- >
- <Placeholder @name="user">
- <UserLink
- @username={{this.solverUsername}}
- >{{this.solverDisplayName}}</UserLink>
- </Placeholder>
- <Placeholder @name="post">
- <a href={{this.postPath}}>{{this.postNumber}}</a>
- </Placeholder>
- </InterpolatedTranslation>
- {{/if}}
- </div>
- <div class="accepted-answer--accepter">
- {{#if this.showMarkedBy}}
- <InterpolatedTranslation
- @key="solved.marked_solved_by"
- as |Placeholder|
- >
- <Placeholder @name="user">
- <UserLink
- @username={{this.accepterUsername}}
- >{{this.accepterDisplayName}}</UserLink>
- </Placeholder>
- </InterpolatedTranslation>
- {{/if}}
- </div>
- </div>
- <div class="quote-controls">
+ <div class="d-solved-answer__header">
+ <h3 class="d-solved-answer__title">
+ {{icon "far-square-check"}}
+ Solved</h3>
+ <div class="d-solved-answer__controls">
{{#if this.content}}
<DButton
- class="btn-flat quote-toggle"
+ class="btn-flat d-solved-answer__toggle"
@action={{this.toggleExpanded}}
@ariaControls={{this.quoteId}}
@ariaExpanded={{this.expanded}}
@@ -161,7 +126,7 @@ export default class SolvedAcceptedAnswer extends Component {
/>
{{/if}}
<DButton
- class="btn-flat back"
+ class="btn-flat d-solved-answer__jump"
@href={{this.postPath}}
@title="post.follow_quote"
@ariaLabel="post.follow_quote"
@@ -169,6 +134,7 @@ export default class SolvedAcceptedAnswer extends Component {
/>
</div>
</div>
+
{{#if this.content}}
<blockquote id={{this.quoteId}}>
<PostCookedHtml
@@ -178,6 +144,41 @@ export default class SolvedAcceptedAnswer extends Component {
/>
</blockquote>
{{/if}}
+
+ <div class="d-solved-answer__footer">
+ {{#if this.showSolvedBy}}
+ <UserLink @username={{this.solverUsername}}>
+ {{boundAvatarTemplate this.acceptedAnswer.avatar_template "tiny"}}
+ </UserLink>
+ <InterpolatedTranslation
+ @key="solved.accepted_answer_solver_info"
+ as |Placeholder|
+ >
+ <Placeholder @name="user" @class="d-solved-answer__solver">
+ {{this.solverDisplayName}}
+ </Placeholder>
+ <Placeholder @name="post">
+ <a
+ class="d-solved-answer__post-link"
+ href={{this.postPath}}
+ >{{this.postNumber}}</a>
+ </Placeholder>
+ </InterpolatedTranslation>
+ {{/if}}
+ {{#if this.showMarkedBy}}
+ <span class="dot-separator"></span>
+
+ <InterpolatedTranslation
+ @key="solved.marked_solved_by"
+ as |Placeholder|
+ >
+ <Placeholder @name="user" @class="d-solved-answer__accepter">
+ {{this.accepterDisplayName}}
+ </Placeholder>
+ </InterpolatedTranslation>
+
+ {{/if}}
+ </div>
</aside>
{{/if}}
</template>
diff --git a/plugins/discourse-solved/assets/stylesheets/mobile/solutions.scss b/plugins/discourse-solved/assets/stylesheets/mobile/solutions.scss
deleted file mode 100644
index 772ddccaf85..00000000000
--- a/plugins/discourse-solved/assets/stylesheets/mobile/solutions.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-#topic-title .d-icon-far-square-check {
- margin-top: 0.25em;
-}
-
-.topic-post {
- nav.post-controls {
- .extra-buttons {
- button {
- max-width: unset;
- white-space: nowrap;
- }
- }
-
- &.expanded {
- .accepted,
- .unaccepted {
- .d-button-label {
- display: none;
- }
- }
- }
- }
-}
-
-li.solved-status-filter {
- margin: 0 3px 5px 3px; // matches core styles
-}
diff --git a/plugins/discourse-solved/assets/stylesheets/solutions.scss b/plugins/discourse-solved/assets/stylesheets/solutions.scss
index 5990daf78a6..65e779cb981 100644
--- a/plugins/discourse-solved/assets/stylesheets/solutions.scss
+++ b/plugins/discourse-solved/assets/stylesheets/solutions.scss
@@ -1,4 +1,52 @@
@use "sass:math";
+@use "lib/viewport";
+
+@keyframes solved-confetti-burst {
+ 0% {
+ transform: translate(-50%, -50%) rotate(0deg);
+ opacity: 1;
+ }
+
+ 100% {
+ transform: translate(
+ calc(-50% + cos(var(--angle)) * var(--distance)),
+ calc(-50% + sin(var(--angle)) * var(--distance) + 50px)
+ )
+ rotate(var(--rotation));
+ opacity: 0;
+ }
+}
+
+.solved-confetti {
+ position: fixed;
+ top: 200px;
+ right: 200px;
+ width: 0;
+ height: 0;
+ z-index: z("header") + 1;
+ overflow: visible;
+ pointer-events: none;
+}
+
+.solved-confetti-particle {
+ position: absolute;
+ width: 8px;
+ height: 8px;
+ border-radius: 2px;
+ animation: solved-confetti-burst 1.5s ease-out forwards;
+
+ @for $i from 1 through 50 {
+ &:nth-child(#{$i}) {
+ --angle: #{math.random(360)}deg;
+ --distance: #{80 + math.random(150)}px;
+ --rotation: #{math.random(720) - 360}deg;
+ --delay: #{math.random(250) * 0.001}s;
+ --color: #{hsl(math.random(360), 80%, 60%)};
+ background-color: var(--color);
+ animation-delay: var(--delay);
+ }
+ }
+}
$solved-color: var(--success);
@@ -46,86 +94,112 @@ $solved-color: var(--success);
height: 100%;
}
-.mobile-view .solved-panel {
- margin-bottom: 15px;
+.user-card-metadata-outlet.accepted-answers {
+ display: inline-block;
}
-.solved-panel {
- .by {
- display: none;
+.post-action-menu__solved-accepted-tooltip-content
+ .fk-d-tooltip__inner-content {
+ display: block;
+}
+
+.topic-statuses .topic-status.--solved {
+ .d-icon {
+ color: $solved-color;
}
- margin-top: 20px;
- margin-bottom: 0;
- font-size: 13px;
}
-aside.quote.accepted-answer {
- > .title {
+.d-solved-answer {
+ border-radius: var(--d-border-radius-large);
+ background: var(--secondary);
+
+ &__header {
display: flex;
- justify-content: space-between;
- align-items: flex-start;
+ align-items: center;
+ color: var(--secondary);
+ background-color: $solved-color;
+ padding-left: var(--space-3);
+ border-top-left-radius: var(--d-border-radius-large);
+ border-top-right-radius: var(--d-border-radius-large);
}
- &.accepted-answer--has-excerpt > .title {
- cursor: pointer;
+ &__title {
+ display: flex;
+ align-items: center;
+ gap: var(--space-2);
+ text-transform: uppercase;
+ font-size: var(--font-down-1);
+ font-weight: normal;
+ margin: 0;
}
- &:not(.accepted-answer--has-excerpt) {
- > .title {
- padding: 0.8em;
- }
+ &__controls {
+ margin-left: auto;
+ }
- > blockquote {
- display: none;
+ &__toggle,
+ &__jump {
+ .d-icon {
+ color: var(--secondary);
+ background: transparent;
+ font-size: var(--font-down-1-rem);
}
- }
- .accepted-answer--solver-accepter {
- display: flex;
- flex-wrap: wrap;
- flex: 1;
- min-width: 0;
- gap: 0.25em;
- }
+ &:hover,
+ &:visited {
+ .discourse-no-touch &,
+ .discourse-touch & {
+ color: var(--secondary);
+ background: transparent;
+
+ .d-icon {
+ color: var(--secondary);
+ background: transparent;
+ }
+ }
+ }
- .accepted-answer--solver {
- margin-right: auto;
+ &:hover {
+ background-color: rgba($solved-color, 0.15);
+ }
}
- .accepted-answer--accepter {
+ &__footer {
+ display: flex;
+ align-items: center;
+ gap: var(--space-1);
+ padding: var(--space-3);
font-size: var(--font-down-1);
- width: 100%;
- flex-basis: auto;
- margin-top: auto;
- margin-bottom: auto;
- margin-right: 0.25em;
-
- @media (width >= 480px) {
- width: auto;
- }
+ color: var(--primary-medium);
}
-}
-
-.user-card-metadata-outlet.accepted-answers {
- display: inline-block;
-}
-
-.post-action-menu__solved-accepted-tooltip-content
- .fk-d-tooltip__inner-content {
- display: block;
-}
-.topic-statuses .topic-status.--solved {
- .d-icon {
- color: $solved-color;
+ &__post-link {
+ font-weight: bold;
}
-}
-aside.quote.accepted-answer[data-expanded="false"] {
> blockquote {
position: relative;
- max-height: 20em;
+ background: var(--secondary);
+ border: 0;
+ padding: var(--space-3);
+ max-height: clamp(1px, 20vh, 20em);
overflow: hidden;
+ margin: 0;
+ border-left: 1px solid var(--primary-low);
+ border-right: 1px solid var(--primary-low);
+
+ * {
+ font-size: var(--font-down-1-rem) !important;
+ }
+
+ .cooked {
+ padding: 0 !important;
+ }
+
+ .anchor::before {
+ content: "" !important;
+ display: none;
+ }
&::after {
content: "";
@@ -138,51 +212,27 @@ aside.quote.accepted-answer[data-expanded="false"] {
pointer-events: none;
}
}
-}
-.solved-confetti {
- position: fixed;
- top: 200px;
- right: 200px;
- width: 0;
- height: 0;
- z-index: z("header") + 1;
- overflow: visible;
- pointer-events: none;
-}
-
-.solved-confetti-particle {
- position: absolute;
- width: 8px;
- height: 8px;
- border-radius: 2px;
- animation: solved-confetti-burst 1.5s ease-out forwards;
+ &__footer {
+ border: 1px solid var(--primary-low);
+ white-space: nowrap;
+ }
- @for $i from 1 through 50 {
- &:nth-child(#{$i}) {
- --angle: #{math.random(360)}deg;
- --distance: #{80 + math.random(150)}px;
- --rotation: #{math.random(720) - 360}deg;
- --delay: #{math.random(250) * 0.001}s;
- --color: #{hsl(math.random(360), 80%, 60%)};
- background-color: var(--color);
- animation-delay: var(--delay);
- }
+ &__solver,
+ &__accepter {
+ @include ellipsis;
}
-}
-@keyframes solved-confetti-burst {
- 0% {
- transform: translate(-50%, -50%) rotate(0deg);
- opacity: 1;
+ &[data-expanded="true"] > blockquote {
+ max-height: none;
+ overflow: visible;
+
+ &::after {
+ display: none;
+ }
}
- 100% {
- transform: translate(
- calc(-50% + cos(var(--angle)) * var(--distance)),
- calc(-50% + sin(var(--angle)) * var(--distance) + 50px)
- )
- rotate(var(--rotation));
- opacity: 0;
+ &:not(.accepted-answer--has-excerpt) > blockquote {
+ display: none;
}
}
diff --git a/plugins/discourse-solved/config/locales/client.en.yml b/plugins/discourse-solved/config/locales/client.en.yml
index 8c5977f3576..27d5e1f8126 100644
--- a/plugins/discourse-solved/config/locales/client.en.yml
+++ b/plugins/discourse-solved/config/locales/client.en.yml
@@ -28,7 +28,7 @@ en:
solution_summary:
one: "solution"
other: "solutions"
- accepted_answer_solver_info: "Solved by %{user} in %{post}"
+ accepted_answer_solver_info: "by %{user} in %{post}"
accepted_answer_post_number: "post %{post_number}"
accepted_notification: "<p><span>%{username}</span> %{description}</p>"
topic_status_filter:
@@ -38,7 +38,7 @@ en:
no_solved_topics_title: "You haven’t solved any topics yet"
no_solved_topics_title_others: "%{username} has not solved any topics yet"
no_solved_topics_body: "When you provide a helpful reply to a topic, your reply might be selected as the solution by the topic owner or staff."
- marked_solved_by: "Marked as solved by %{user}"
+ marked_solved_by: "accepted by %{user}"
confirm_move_solution_title: "Move solution post"
confirm_move_solution:
one: "The post you selected is marked as the solution for this topic. If you move it, the topic will be updated to unsolved."
diff --git a/plugins/discourse-solved/lib/discourse_solved/topic_extension.rb b/plugins/discourse-solved/lib/discourse_solved/topic_extension.rb
index f98762aaef2..e857cd46aee 100644
--- a/plugins/discourse-solved/lib/discourse_solved/topic_extension.rb
+++ b/plugins/discourse-solved/lib/discourse_solved/topic_extension.rb
@@ -23,6 +23,7 @@ module DiscourseSolved::TopicExtension
post_number: answer_post.post_number,
username: answer_post_user.username,
name: answer_post_user.name,
+ avatar_template: answer_post_user.avatar_template,
excerpt:,
}
diff --git a/plugins/discourse-solved/plugin.rb b/plugins/discourse-solved/plugin.rb
index a42dcf21f45..11c5d4dca39 100644
--- a/plugins/discourse-solved/plugin.rb
+++ b/plugins/discourse-solved/plugin.rb
@@ -14,7 +14,6 @@ register_svg_icon "square-check"
register_svg_icon "far-square"
register_asset "stylesheets/solutions.scss"
-register_asset "stylesheets/mobile/solutions.scss", :mobile
module ::DiscourseSolved
PLUGIN_NAME = "discourse-solved"
diff --git a/plugins/discourse-solved/spec/system/solved_spec.rb b/plugins/discourse-solved/spec/system/solved_spec.rb
index 481c804e190..9b3095369d2 100644
--- a/plugins/discourse-solved/spec/system/solved_spec.rb
+++ b/plugins/discourse-solved/spec/system/solved_spec.rb
@@ -12,9 +12,9 @@ describe "Solved" do
UNACCEPTED_BUTTON_SELECTOR = ".post-action-menu__solved-unaccepted"
ACCEPTED_BUTTON_SELECTOR = ".post-action-menu__solved-accepted"
ACCEPTED_ANSWER_QUOTE_SELECTOR = "aside.accepted-answer.quote"
- SOLVER_INFO_SELECTOR = ".title .accepted-answer--solver"
- ACCEPTER_INFO_SELECTOR = ".title .accepted-answer--accepter"
- QUOTE_TOGGLE_SELECTOR = "aside.accepted-answer.quote button.quote-toggle"
+ SOLVER_INFO_SELECTOR = ".d-solved-answer__footer .d-solved-answer__solver"
+ ACCEPTER_INFO_SELECTOR = ".d-solved-answer__footer .d-solved-answer__accepter"
+ QUOTE_TOGGLE_SELECTOR = "aside.accepted-answer.quote button.d-solved-answer__toggle"
before do
SiteSetting.solved_enabled = true
@@ -126,10 +126,8 @@ describe "Solved" do
end
def verify_solver_and_accepter_info
- expect(topic_page.find(SOLVER_INFO_SELECTOR)).to have_content("Solved by #{solver.name}")
- expect(topic_page.find(ACCEPTER_INFO_SELECTOR)).to have_content(
- "Marked as solved by #{accepter.name}",
- )
+ expect(topic_page.find(SOLVER_INFO_SELECTOR)).to have_content(solver.name)
+ expect(topic_page.find(ACCEPTER_INFO_SELECTOR)).to have_content(accepter.name)
end
def verify_solution_info_present