krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(modals): Small style scroll award

Browse Source
This commit is contained in:
Sabe Jones
2015-10-09 15:39:36 -04:00
parent b775b8f399
commit f00bbd9652
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/public/js/controllers/notificationCtrl.js
View File

@@ -98,7 +98,7 @@ habitrpg.controller('NotificationCtrl',
Notification.drop(env.t('messageDropFood', {dropArticle: after.article, dropText: text, dropNotes: notes}), after); Notification.drop(env.t('messageDropFood', {dropArticle: after.article, dropText: text, dropNotes: notes}), after);
} else if (after.type === 'Quest') { } else if (after.type === 'Quest') {
$rootScope.selectedQuest = Content.quests[after.key]; $rootScope.selectedQuest = Content.quests[after.key];
$rootScope.openModal('questDrop', {controller:'PartyCtrl'}); $rootScope.openModal('questDrop', {controller:'PartyCtrl',size:'sm'});
} else if (after.notificationType === 'Mystery') { } else if (after.notificationType === 'Mystery') {
text = Content.gear.flat[after.key].text(); text = Content.gear.flat[after.key].text();
Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), after); Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), after);

24
website/views/shared/modals/quests.jade
View File

@@ -88,21 +88,21 @@ script(type='text/ng-template', id='modals/questDrop.html')
h3=env.t('unlockedAQuest') h3=env.t('unlockedAQuest')
h4 {{::selectedQuest.text()}} h4 {{::selectedQuest.text()}}
.container-fluid .container-fluid
.row(ng-controller='UserCtrl') .row(style='margin-bottom:1em', ng-controller='UserCtrl')
.col-md-4 .col-xs-4(style='padding:0')
.herobox .herobox(style='padding:0; width: 0; height: 0')
.character-sprites .character-sprites(style='width:0')
+generatedAvatar +generatedAvatar
.col-md-4 .col-xs-4(style='padding:0')
.herobox .herobox(style='width: 0; height: 5em; position: initial')
.avatar-level(style='margin:4em auto auto 1.4em; position:static', ng-class='userLevelStyle(user)')=env.t('level')+' {{user.stats.lvl}}' .avatar-level(ng-class='userLevelStyle(user)')=env.t('level')+' {{user.stats.lvl}}'
.col-md-4(style='margin-top:3.5em') .col-xs-4(style='margin-top:1.5em')
.quest-icon(class='inventory_quest_scroll_{{::selectedQuest.key}}') .quest-icon(class='inventory_quest_scroll_{{::selectedQuest.key}}')
h4!=env.t('leveledUpReceivedQuest', {level:'{{user.stats.lvl}}'}) h4!=env.t('leveledUpReceivedQuest', {level:'{{user.stats.lvl}}'})
.modal-footer .modal-footer(style='margin-top:0')
button.btn.btn-primary(ng-click='inviteOrStartParty(group); $close()', ng-if='!party.members')=env.t('startAParty') button.btn.btn-primary.btn-sm(ng-click='inviteOrStartParty(group); $close()', ng-if='!party.members')=env.t('startAParty')
button.btn.btn-primary(ng-click='questInit(); $close()', ng-if='party.members')=env.t('inviteParty') button.btn.btn-primary.btn-sm(ng-click='questInit(); $close()', ng-if='party.members')=env.t('inviteParty')
button.btn.btn-default(ng-click='closeQuest(); $close()')=env.t('questLater') button.btn.btn-default.btn-sm(ng-click='closeQuest(); $close()')=env.t('questLater')
script(type='text/ng-template', id='modals/ownedQuests.html') script(type='text/ng-template', id='modals/ownedQuests.html')
.modal-header .modal-header