UX: Tweak 'Solution' button design (#230)

assets/javascripts/discourse/initializers/extend-for-solved-button.js

@@ -86,39 +86,32 @@ function initializeWithApi(api) {
   }
 
   api.addPostMenuButton("solved", (attrs) => {
-    const canAccept = attrs.can_accept_answer;
+    const isOp = currentUser?.id === attrs.topicCreatedById;
-    const canUnaccept = attrs.can_unaccept_answer;
-    const accepted = attrs.accepted_answer;
-    const isOp = currentUser && currentUser.id === attrs.topicCreatedById;
-    const position =
-      !accepted && canAccept && !isOp ? "second-last-hidden" : "first";
 
-    if (canAccept) {
+    if (attrs.can_accept_answer) {
       return {
         action: "acceptAnswer",
         icon: "far-check-square",
         className: "unaccepted",
         title: "solved.accept_answer",
-        label: "solved.solution",
+        label: isOp ? "solved.solution" : null,
-        position,
+        position: isOp ? "first" : "second",
       };
-    } else if (canUnaccept && accepted) {
+    } else if (attrs.accepted_answer) {
-      const title = canUnaccept
+      if (attrs.can_unaccept_answer) {
-        ? "solved.unaccept_answer"
-        : "solved.accepted_answer";
         return {
           action: "unacceptAnswer",
           icon: "check-square",
-        title,
+          title: "solved.unaccept_answer",
           className: "accepted fade-out",
-        position,
+          position: isOp ? "first" : "second",
-        label: "solved.solution",
+          label: isOp ? "solved.solution" : null,
         };
-    } else if (!canAccept && accepted) {
+      } else {
         return {
           className: "hidden",
           disabled: "true",
-        position,
+          position: "first",
           beforeButton(h) {
             return h(
               "span.accepted-text",
@@ -133,6 +126,7 @@ function initializeWithApi(api) {
           },
         };
       }
+    }
   });
 
   api.decorateWidget("post-contents:after-cooked", (dec) => {