codeninjasllc/discourse
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UX: move category logo above navigation

Browse source
This commit is contained in:
Arpit Jalan 2016-06-18 14:08:03 +05:30
parent 5e8d1549a4
commit 605a302546
2 changed files with 30 additions and 24 deletions
app/assets
javascripts/discourse/templates/navigation
category.hbs
stylesheets/desktop
topic-list.scss

20
app/assets/javascripts/discourse/templates/navigation/category.hbs
View file

@ -1,3 +1,13 @@
<section class='category-heading'>
{{#if category.logo_url}}
{{cdn-img src=category.logo_url class="category-logo"}}
{{#if category.description}}
<p>{{{category.description}}}</p>
{{/if}}
{{/if}}
</section>
<div class='category-navigation'>
{{bread-crumbs categories=categories {{bread-crumbs categories=categories
category=category category=category
noSubcategories=noSubcategories noSubcategories=noSubcategories
@ -21,12 +31,4 @@
{{#if canEditCategory}} {{#if canEditCategory}}
{{d-button class="btn-default edit-category" action="editCategory" actionParam=category icon="wrench" label="category.edit_long"}} {{d-button class="btn-default edit-category" action="editCategory" actionParam=category icon="wrench" label="category.edit_long"}}
{{/if}} {{/if}}
</div>
<section class='category-heading'>
{{#if category.logo_url}}
{{cdn-img src=category.logo_url class="category-logo"}}
{{#if category.description}}
<p>{{{category.description}}}</p>
{{/if}}
{{/if}}
</section>

4
app/assets/stylesheets/desktop/topic-list.scss
View file

@ -289,6 +289,10 @@ button.dismiss-read {
} }
} }
.category-navigation {
clear: both;
}
.category-logo { .category-logo {
max-height: 150px; max-height: 150px;
float: left; float: left;