From 2e0832fa71b3d9a826668d584133038938deb85a Mon Sep 17 00:00:00 2001 From: Robin Ward <robin.ward@gmail.com> Date: Fri, 4 Jul 2014 15:35:02 -0400 Subject: [PATCH] TWEAK: Add the category description beside the logo, if present. --- .../discourse/templates/navigation/category.js.handlebars | 3 +++ app/assets/stylesheets/desktop/topic-list.scss | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars b/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars index be683ebff..a4a6ecdbd 100644 --- a/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars +++ b/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars @@ -25,5 +25,8 @@ <section class='category-heading'> {{#if category.logo_url}} <img {{bind-attr src=category.logo_url}} class="category-logo"> + {{#if category.description}} + <p>{{category.description}}</p> + {{/if}} {{/if}} </section> diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index 9870560d2..7398f3f8b 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -285,9 +285,14 @@ button.dismiss-read { .category-heading { clear: both; + p { + line-height: 1.5em; + font-size: 1.5em; + } } .category-logo { max-height: 150px; float: left; margin-bottom: 15px; + margin-right: 15px; }