Merge branch 'Hus274-develop7019' into develop

This commit is contained in:
Blade Barringer 2016-06-04 07:54:59 -05:00
commit f53c2706d1

View file

@ -7,11 +7,11 @@ script(type='text/ng-template', id='modals/levelUp.html')
h3(style='margin-bottom: 0')=env.t('gainedLevel')
.container-fluid
.row
.herobox(style='margin:auto 8.3em; width: 6em; height: 9em; padding-top: 0')
.herobox(style='margin:auto 8.3em; width: 6em; height: 9em; padding-top: 0; cursor:default')
.character-sprites(style='margin: 0; width: 0')
+generatedAvatar
.row
.herobox(style='margin:auto 8.9em; width: 6em; height: 0; padding-top: 0')
.herobox(style='margin:auto 8.9em; width: 6em; height: 0; padding-top: 0; cursor:default')
.avatar-level(ng-class='userLevelStyle(user)')=env.t('level')+' {{user.stats.lvl}}'
h4(style='margin-top: 1em')!=env.t('leveledUp', {level:'{{user.stats.lvl}}'})
p=env.t('fullyHealed')