From f00bbd96529d745c515c24a0652ac0b1f72cf3e7 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 9 Oct 2015 15:39:36 -0400 Subject: [PATCH] feat(modals): Small style scroll award --- .../public/js/controllers/notificationCtrl.js | 2 +- website/views/shared/modals/quests.jade | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/website/public/js/controllers/notificationCtrl.js b/website/public/js/controllers/notificationCtrl.js index 06c8dc74be..2f13089ca6 100644 --- a/website/public/js/controllers/notificationCtrl.js +++ b/website/public/js/controllers/notificationCtrl.js @@ -98,7 +98,7 @@ habitrpg.controller('NotificationCtrl', Notification.drop(env.t('messageDropFood', {dropArticle: after.article, dropText: text, dropNotes: notes}), after); } else if (after.type === 'Quest') { $rootScope.selectedQuest = Content.quests[after.key]; - $rootScope.openModal('questDrop', {controller:'PartyCtrl'}); + $rootScope.openModal('questDrop', {controller:'PartyCtrl',size:'sm'}); } else if (after.notificationType === 'Mystery') { text = Content.gear.flat[after.key].text(); Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), after); diff --git a/website/views/shared/modals/quests.jade b/website/views/shared/modals/quests.jade index e9b6418e94..69178ada8e 100644 --- a/website/views/shared/modals/quests.jade +++ b/website/views/shared/modals/quests.jade @@ -88,21 +88,21 @@ script(type='text/ng-template', id='modals/questDrop.html') h3=env.t('unlockedAQuest') h4 {{::selectedQuest.text()}} .container-fluid - .row(ng-controller='UserCtrl') - .col-md-4 - .herobox - .character-sprites + .row(style='margin-bottom:1em', ng-controller='UserCtrl') + .col-xs-4(style='padding:0') + .herobox(style='padding:0; width: 0; height: 0') + .character-sprites(style='width:0') +generatedAvatar - .col-md-4 - .herobox - .avatar-level(style='margin:4em auto auto 1.4em; position:static', ng-class='userLevelStyle(user)')=env.t('level')+' {{user.stats.lvl}}' - .col-md-4(style='margin-top:3.5em') + .col-xs-4(style='padding:0') + .herobox(style='width: 0; height: 5em; position: initial') + .avatar-level(ng-class='userLevelStyle(user)')=env.t('level')+' {{user.stats.lvl}}' + .col-xs-4(style='margin-top:1.5em') .quest-icon(class='inventory_quest_scroll_{{::selectedQuest.key}}') h4!=env.t('leveledUpReceivedQuest', {level:'{{user.stats.lvl}}'}) - .modal-footer - button.btn.btn-primary(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-default(ng-click='closeQuest(); $close()')=env.t('questLater') + .modal-footer(style='margin-top:0') + button.btn.btn-primary.btn-sm(ng-click='inviteOrStartParty(group); $close()', ng-if='!party.members')=env.t('startAParty') + button.btn.btn-primary.btn-sm(ng-click='questInit(); $close()', ng-if='party.members')=env.t('inviteParty') + button.btn.btn-default.btn-sm(ng-click='closeQuest(); $close()')=env.t('questLater') script(type='text/ng-template', id='modals/ownedQuests.html') .modal-header