IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Convert quote controls to use d-icon

Browse Source
This commit is contained in:
Robin Ward 2017-10-06 15:27:02 -04:00
parent f4decf9193
commit 494ad1e9de
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/widgets/post-cooked.js.es6
View File

@ -163,7 +163,8 @@ export default class PostCooked {
// If we have a post reference // If we have a post reference
if (postNumber) { if (postNumber) {
navLink = `<a href='${this._urlForPostNumber(postNumber)}' title='${quoteTitle}' class='back'></a>`; let icon = iconHTML('arrow-up');
navLink = `<a href='${this._urlForPostNumber(postNumber)}' title='${quoteTitle}' class='back'>${icon}</a>`;
} }
// Only add the expand/contract control if it's not a full post // Only add the expand/contract control if it's not a full post
@ -188,7 +189,8 @@ export default class PostCooked {
// Unless it's a full quote, allow click to expand // Unless it's a full quote, allow click to expand
if (!($aside.data('full') || $title.data('has-quote-controls'))) { if (!($aside.data('full') || $title.data('has-quote-controls'))) {
$title.on('click', e2 => { $title.on('click', e2 => {
if ($(e2.target).is('a')) return true; let $target = $(e2.target);
if ($target.closest('a').length) { return true; }
this._toggleQuote($aside); this._toggleQuote($aside);
}); });
$title.data('has-quote-controls', true); $title.data('has-quote-controls', true);

7
app/assets/stylesheets/common/base/topic-post.scss
View File

@ -87,7 +87,7 @@ aside.quote {
} }
} }
.quote-controls { .quote-controls, .quote-controls .d-icon {
color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
} }
@ -114,8 +114,9 @@ aside.quote {
.quote-controls { .quote-controls {
float: right; float: right;
a { display: flex;
margin: 0; .d-icon {
margin-left: 0.2em;
} }
} }