krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(client): Show battle with friends button with 3 members

Browse Source 
fixes #6754
closes #6765
This commit is contained in:
Blade Barringer
2016-08-24 08:21:26 -05:00
parent e957617386
commit 5bcc2561ae
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
website/client/css/header.styl
View File

@@ -169,6 +169,12 @@ header .hero-stats
display: table-cell display: table-cell
width: 100% width: 100%
// To align invite button with .herobox-wrap
.party-invite-wrap
display: table-cell
vertical-align: middle
height: 10.5em
button.party-invite button.party-invite
display: block display: block
margin: 57px auto margin: auto 10px

9
website/views/shared/header/header.jade
View File

@@ -31,9 +31,10 @@
| {{Math.floor(user.stats.mp)}} / {{user.fns.statsComputed().maxMP}} | {{Math.floor(user.stats.mp)}} / {{user.fns.statsComputed().maxMP}}
// party // party
.party(ng-controller='PartyCtrl') .party(ng-controller='PartyCtrl')
button.party-invite.btn.btn-primary(ng-click="inviteOrStartParty(party)",
ng-if="(!party.members || party.memberCount === 1) && user.preferences.displayInviteToPartyWhenPartyIs1",
popover="{{!party.members ? env.t('startAParty') : env.t('addToParty')}}", popover-placement="left", popover-trigger="mouseenter")
span=env.t("battleWithFriends")
.herobox-wrap(ng-repeat='profile in partyMinusSelf') .herobox-wrap(ng-repeat='profile in partyMinusSelf')
+herobox() +herobox()
.party-invite-wrap
button.party-invite.btn.btn-primary(ng-click="inviteOrStartParty(party)",
ng-if="(!party.members || party.memberCount < 4 ) && user.preferences.displayInviteToPartyWhenPartyIs1",
popover="{{!party.members ? env.t('startAParty') : env.t('addToParty')}}", popover-placement="left", popover-trigger="mouseenter")
span=env.t("battleWithFriends")