discourse/discourse-solved
1
0
Fork 0
mirror of https://github.com/discourse/discourse-solved.git synced 2025-07-04 21:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

UX: Integrate text with button to improve spacing

Browse Source
This commit is contained in:
Kris 2019-07-16 11:08:05 -04:00
parent 33a28ced7e
commit ad4bae2f4d
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
View File

@ -96,9 +96,7 @@ function initializeWithApi(api, container) {
title: "solved.accept_answer", title: "solved.accept_answer",
className: "unaccepted", className: "unaccepted",
position, position,
afterButton(h) { label: "solved.mark_as_solution"
return h("span.unaccepted", I18n.t("solved.mark_as_solution"));
}
}; };
} else if (attrs.accepted_answer) { } else if (attrs.accepted_answer) {
return { return {
@ -107,9 +105,7 @@ function initializeWithApi(api, container) {
title: "solved.accept_answer", title: "solved.accept_answer",
className: "accepted", className: "accepted",
position: "first", position: "first",
afterButton(h) { label: "solved.solution"
return h("span.accepted", I18n.t("solved.solution"));
}
}; };
} }
}); });

6
assets/stylesheets/mobile/solutions.scss
View File

@ -1,3 +1,9 @@
#topic-title .d-icon-far-check-square { #topic-title .d-icon-far-check-square {
margin-top: 0.25em; margin-top: 0.25em;
} }
.accepted {
.d-button-label {
display: none;
}
}

16
assets/stylesheets/solutions.scss
View File

@ -50,13 +50,15 @@
} }
} }
.post-controls .unaccepted { .post-controls {
color: dark-light-choose($primary-low-mid, $secondary-high); .unaccepted,
} .accepted {
&.btn-icon-text {
.post-controls span:not(.d-button-label) { .d-icon {
display: inline-flex; margin-right: 0.3em;
align-items: center; }
}
}
} }
.post-controls .accepted-text { .post-controls .accepted-text {