diff --git a/common/common.scss b/common/common.scss index b9afe9f..372138f 100644 --- a/common/common.scss +++ b/common/common.scss @@ -12,6 +12,10 @@ margin-bottom: 20px; width: 100%; + p:first-child { + display: none; + } + &.has-logo { border: 2px solid $tertiary; padding: 1em; diff --git a/javascripts/discourse/components/category-name-header.js.es6 b/javascripts/discourse/components/category-name-header.js.es6 index 4a2582f..53629d6 100644 --- a/javascripts/discourse/components/category-name-header.js.es6 +++ b/javascripts/discourse/components/category-name-header.js.es6 @@ -7,14 +7,13 @@ export default Component.extend({ didInsertElement() { scheduleOnce('afterRender', () => { let $el = $(this.element); - + $el.appendTo('section.category-heading'); + if (this.category.uploaded_logo) { - $el.insertAfter('section.category-heading .category-logo'); - $('section.category-heading').addClass('has-logo'); - $('section.category-heading .category-name-header, section.category-heading p').wrapAll('
'); - } else { - $el.appendTo('section.category-heading'); + $('section.category-heading').addClass('has-logo'); } + + $('section.category-heading .category-name-header, section.category-heading p').wrapAll('
'); }); } }) \ No newline at end of file diff --git a/javascripts/discourse/templates/components/category-name-header.hbs b/javascripts/discourse/templates/components/category-name-header.hbs index 8ea1282..25210a8 100644 --- a/javascripts/discourse/templates/components/category-name-header.hbs +++ b/javascripts/discourse/templates/components/category-name-header.hbs @@ -1 +1,4 @@ -{{category.name}} \ No newline at end of file +{{category.name}} +{{#if category.description}} +

{{dir-span category.description}}

+{{/if}} \ No newline at end of file