From 82e07cb0f4c887d3e7a1da32136bb0b5a639b2ef Mon Sep 17 00:00:00 2001 From: tshenry Date: Thu, 15 Aug 2019 16:04:50 -0700 Subject: [PATCH] UX: Consistent placement of category-title-before plugin outlet (#8010) --- .../templates/components/categories-boxes-with-topics.hbs | 2 +- .../discourse/templates/components/category-title-link.hbs | 3 +-- app/assets/stylesheets/mobile/topic-list.scss | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs index 7a793714c04..6df50c4eef4 100644 --- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs +++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs @@ -11,10 +11,10 @@ {{/if}}

+ {{category-title-before category=c}} {{#if c.read_restricted}} {{d-icon 'lock'}} {{/if}} - {{category-title-before category=c}} {{c.name}}

diff --git a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs index 542a9000804..f973a28f1f3 100644 --- a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs +++ b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs @@ -1,10 +1,9 @@ -{{category-title-before category=category}}
+ {{category-title-before category=category}} {{#if category.read_restricted}} {{d-icon 'lock'}} {{/if}} - {{dir-span category.name}}
{{#if category.uploaded_logo.url}} diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 84930d0fef3..cc0d77eb346 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -278,7 +278,6 @@ tr.category-topic-link { h3 { max-width: 100%; - display: inline-block; font-size: $font-up-2; padding: 0 0 0 10px; .d-icon {