discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-09 14:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

UX: 'Join Group' button position moved to group header

Browse Source
This commit is contained in:
Vinoth Kannan 2017-03-15 12:22:49 +05:30 committed by Guo Xiang Tan
parent 61a7162c01
commit d3f07122c4
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/templates/group-index.hbs
View File

@ -1,7 +1,3 @@
{{group-membership-button model=model
createNewMessageViaParams='createNewMessageViaParams'
showLogin='showLogin'}}
{{#if hasMembers}} {{#if hasMembers}}
{{#load-more selector=".group-members tr" action="loadMore"}} {{#load-more selector=".group-members tr" action="loadMore"}}
<table class='group-members'> <table class='group-members'>

30
app/assets/javascripts/discourse/templates/group.hbs
View File

@ -29,17 +29,25 @@
{{/if}} {{/if}}
</div> </div>
{{#mobile-nav class='group-nav' desktopClass="nav nav-pills" currentPath=application.currentPath}} <div class="list-controls">
{{#each getTabs as |tab|}} <div class="container">
<li> {{#mobile-nav class='group-nav' desktopClass="nav nav-pills" currentPath=application.currentPath}}
{{#link-to tab.location model title=tab.message}} {{#each getTabs as |tab|}}
{{#if tab.icon}}{{fa-icon tab.icon}}{{/if}} <li>
{{tab.message}} {{#link-to tab.location model title=tab.message}}
{{#if tab.count}}<span class='count'>({{tab.count}})</span>{{/if}} {{#if tab.icon}}{{fa-icon tab.icon}}{{/if}}
{{/link-to}} {{tab.message}}
</li> {{#if tab.count}}<span class='count'>({{tab.count}})</span>{{/if}}
{{/each}} {{/link-to}}
{{/mobile-nav}} </li>
{{/each}}
{{/mobile-nav}}
{{group-membership-button model=model
createNewMessageViaParams='createNewMessageViaParams'
showLogin='showLogin'}}
</div>
</div>
<div class='group-outlet'> <div class='group-outlet'>
{{outlet}} {{outlet}}

3
app/assets/stylesheets/mobile/group.scss
View File

@ -20,6 +20,7 @@
.group-nav.mobile-nav { .group-nav.mobile-nav {
margin-bottom: 15px; margin-bottom: 15px;
float: left;
} }
.group-activity { .group-activity {
@ -29,7 +30,7 @@
.group-activity-nav.mobile-nav { .group-activity-nav.mobile-nav {
position: absolute; position: absolute;
right: 0px; right: 0px;
top: -50px; top: -55px;
} }
.group-activity-outlet { .group-activity-outlet {