github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 19:36:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/assets/javascripts/discourse/templates/navigation/category.hbs
View File

@ -1,27 +1,3 @@
{{bread-crumbs categories=categories
category=category
noSubcategories=noSubcategories
hideSubcategories=showingSubcategoryList}}
{{navigation-bar navItems=navItems filterMode=filterMode}}
{{#if currentUser}}
{{category-notifications-button category=category}}
{{/if}}
{{#if canCreateTopic}}
{{d-button id="create-topic"
class="btn-default"
action="createTopic"
icon="plus"
label="topic.create"
disabled=cannotCreateTopicOnCategory}}
{{/if}}
{{#if canEditCategory}}
{{d-button class="btn-default edit-category" action="editCategory" actionParam=category icon="wrench" label="category.edit_long"}}
{{/if}}
<section class='category-heading'> <section class='category-heading'>
{{#if category.logo_url}} {{#if category.logo_url}}
{{cdn-img src=category.logo_url class="category-logo"}} {{cdn-img src=category.logo_url class="category-logo"}}
@ -30,3 +6,29 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
</section> </section>
<div class='category-navigation'>
{{bread-crumbs categories=categories
category=category
noSubcategories=noSubcategories
hideSubcategories=showingSubcategoryList}}
{{navigation-bar navItems=navItems filterMode=filterMode}}
{{#if currentUser}}
{{category-notifications-button category=category}}
{{/if}}
{{#if canCreateTopic}}
{{d-button id="create-topic"
class="btn-default"
action="createTopic"
icon="plus"
label="topic.create"
disabled=cannotCreateTopicOnCategory}}
{{/if}}
{{#if canEditCategory}}
{{d-button class="btn-default edit-category" action="editCategory" actionParam=category icon="wrench" label="category.edit_long"}}
{{/if}}
</div>

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;