refactor(bs3): port several modals & css fixes

This commit is contained in:
Matteo Pagliazzi
2014-02-01 17:04:21 +01:00
parent 0a047f5b2f
commit af42ec263e
5 changed files with 36 additions and 32 deletions
+6 -6
View File
@@ -6,7 +6,7 @@ script(id='modals/achievements/streak.html', type='text/ng-template')
.achievement.achievement-thermometer
=env.t('streakerAchievement')
.modal-footer
button.btn.btn-default.cancel(ng-click='modals.achievements.streak = false')=env.t('ok')
button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok')
// Max Gear
script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
@@ -16,10 +16,10 @@ script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
.achievement.achievement-armor
=env.t('gearAchievement')
.modal-footer
button.btn.btn-default.cancel(ng-click='modals.achievements.ultimateGear = false')=env.t('ok')
button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok')
// Beast Master
script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
script(id='modals/achievements/beastMaster.html', type='text/ng-template')
.modal-header
h3=env.t('modalAchievement')
.modal-body
@@ -27,7 +27,7 @@ script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
.achievement.achievement-rat
=env.t('beastAchievement')
.modal-footer
button.btn.btn-default.cancel(ng-click='modals.achievements.beastMaster = false')=env.t('ok')
button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok')
// Contributor
// activated by user.flags.contributor
@@ -40,7 +40,7 @@ script(id='modals/achievements/contributor.html', type='text/ng-template')
!=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"})
a(href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink')
.modal-footer
button.btn.btn-default.cancel(ng-click='set({"flags.contributor":false})')=env.t('ok')
button.btn.btn-default.cancel(ng-click='set({"flags.contributor":false}); $close()')=env.t('ok')
//Rebirth
script(id='modals/achievements/rebirth.html', type='text/ng-template')
@@ -50,4 +50,4 @@ script(id='modals/achievements/rebirth.html', type='text/ng-template')
.achievement.achievement-sun
=env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"})
.modal-footer
button.btn.btn-default.cancel(ng-click='modals.achievements.rebirth = false')=env.t('ok')
button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok')
+1 -1
View File
@@ -1,6 +1,6 @@
//div(modal='user.stats.hp <= 0', options='{backdrop:true, keyboard:false, backdropClick:false}')
script(type='text/ng-template', id='modals/death.html')
.modal-body
.modal-body.death-modal
.row
.col-md-3
figure.notification-character