Skip to content
This repository was archived by the owner on Jul 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { ajax } from "discourse/lib/ajax";
import PostCooked from "discourse/widgets/post-cooked";
import { formatUsername } from "discourse/lib/utilities";
import { iconHTML } from "discourse-common/lib/icon-library";
import { iconNode } from "discourse-common/lib/icon-library";

function clearAccepted(topic) {
const posts = topic.get("postStream.posts");
Expand Down Expand Up @@ -95,9 +96,10 @@ function initializeWithApi(api) {
icon: "far-check-square",
className: "unaccepted",
title: "solved.accept_answer",
label: "solved.solution",
position
};
} else if (canUnaccept || accepted) {
} else if (canUnaccept && accepted) {
const title = canUnaccept
? "solved.unaccept_answer"
: "solved.accepted_answer";
Expand All @@ -107,8 +109,25 @@ function initializeWithApi(api) {
title,
className: "accepted fade-out",
position,
label: "solved.solution"
};
} else if (!canAccept && accepted) {
let solutionText = iconHTML("check");
return {
className: "hidden",
disabled: "true",
position,
beforeButton(h) {
return h("span.accepted-text", I18n.t("solved.solution"));
return h(
"span.accepted-text",
{
title: I18n.t("solved.accepted_description")
},
[
h("span", iconNode("check")),
h("span.accepted-label", I18n.t("solved.solution"))
]
);
}
};
}
Expand Down
22 changes: 22 additions & 0 deletions assets/stylesheets/mobile/solutions.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
#topic-title .d-icon-far-check-square {
margin-top: 0.25em;
}

.topic-post {
nav.post-controls {
.extra-buttons {
button {
max-width: unset;
white-space: nowrap;
}
}
&.expanded {
.accepted,
.unaccepted {
.d-icon {
margin: 0;
}
.d-button-label {
display: none;
}
}
}
}
}
14 changes: 9 additions & 5 deletions assets/stylesheets/solutions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@
align-items: baseline;
}

.post-controls .accepted-text {
display: inline-block;
font-size: inherit;
margin-right: -3px;
z-index: 2;
.post-controls span.accepted-text {
padding: 8px 10px;
font-size: $font-up-1;
span {
display: inline-block;
}
.accepted-label {
margin-left: 7px;
}
}

// you can style accepted answers however your want
Expand Down
1 change: 1 addition & 0 deletions config/locales/client.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ en:
title: "Solved"
allow_accepted_answers: "Allow topic owner and staff to mark a reply as the solution"
accept_answer: "Select if this reply solves the problem"
accepted_description: "This is the accepted solution to this topic"
has_no_accepted_answer: "This topic has no solution"
unaccept_answer: "Unselect if this reply no longer solves the problem"
accepted_answer: "Solution"
Expand Down