From d3943b97dfba08dc84a56f306eba987081ab5ad5 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 15 Mar 2018 17:51:19 +0100 Subject: [PATCH] FIX: align suggested messages --- .../discourse/components/suggested-topics.js.es6 | 2 +- .../discourse/templates/components/suggested-topics.hbs | 6 ++++-- app/assets/stylesheets/common/base/topic.scss | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js.es6 index 13af913af3a..b557bda31a0 100644 --- a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 +++ b/app/assets/javascripts/discourse/components/suggested-topics.js.es6 @@ -9,7 +9,7 @@ export default Ember.Component.extend({ suggestedTitle(topic) { const href = this.currentUser && this.currentUser.pmPath(topic); return topic.get('isPrivateMessage') && href ? - `${iconHTML('envelope', { class: 'private-message-glyph' })} ${I18n.t("suggested_topics.pm_title")}` : + `${iconHTML('envelope', { class: 'private-message-glyph' })}${I18n.t("suggested_topics.pm_title")}` : I18n.t("suggested_topics.title"); }, diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs index 76127f2bf50..8d0263c71c4 100644 --- a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs +++ b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs @@ -1,4 +1,5 @@ -

{{{suggestedTitle}}}

+

{{{suggestedTitle}}}

+
{{#if topic.isPrivateMessage}} {{basic-topic-list @@ -9,4 +10,5 @@ {{basic-topic-list topics=topic.suggestedTopics}} {{/if}}
-

{{{browseMoreMessage}}}

+ +

{{{browseMoreMessage}}}

diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index 0a76f198ab6..9122c92528e 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -145,7 +145,6 @@ a.badge-category { .badge-wrapper { float: left; } - } .has-pending-posts { @@ -183,6 +182,11 @@ a.badge-category { max-width: 150px; } +#suggested-topics .suggested-topics-title { + display: flex; + align-items: center; +} + .topic-unsubscribe { .notifications-button { display: inline-block;