sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-14 07:52:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3613 from negue/fix_margins

Browse source 
fix avatar and background margin
This commit is contained in:
Tyler Renelle 2014-06-16 17:36:40 -06:00
commit b2ebc93cac
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
views/options/profile.jade
View file

@ -7,7 +7,7 @@ mixin gemCost(cost)
// Make it a mixin so we can call it from mobile
mixin customizeProfile(mobile)
div(class=mobile ? 'padding' : 'row')
div(class=mobile ? 'padding' : 'container-fluid row')
.col-md-4
h3(class=mobile?'item item-divider':'')=env.t('bodyBody')
@ -236,16 +236,15 @@ script(id='partials/options.profile.profile.html', type='text/ng-template')
script(type='text/ng-template', id='partials/options.profile.backgrounds.html')
.container-fluid
.row
menu(type='list')
each bgs,k in env.Content.backgrounds
li.customize-menu
menu(label=env.t(k))
+gemCost(7)
//-button.btn.btn-xs(ng-hide="ownsSet('background',Content.backgrounds['#{k}'])",ng-click="unlock(setKeys('background',Content.backgrounds['#{k}']))")!= env.t('unlockSet',{cost:15}) + ' <span class="Pet_Currency_Gem1x inline-gems"/>'
button.btn.btn-xs(ng-hide="ownsSet('background',#{JSON.stringify(bgs)})",ng-click="unlock(setKeys('background',#{JSON.stringify(bgs)}))")!= env.t('unlockSet',{cost:15}) + ' <span class="Pet_Currency_Gem1x inline-gems"/>'
each bg,k in bgs
button.customize-option(type='button',class='background_#{k}',ng-click='unlock("background.#{k}")',popover-title=bg.text(),popover=bg.notes(),popover-trigger='mouseenter')
menu(type='list')
each bgs,k in env.Content.backgrounds
li.customize-menu
menu(label=env.t(k))
+gemCost(7)
//-button.btn.btn-xs(ng-hide="ownsSet('background',Content.backgrounds['#{k}'])",ng-click="unlock(setKeys('background',Content.backgrounds['#{k}']))")!= env.t('unlockSet',{cost:15}) + ' <span class="Pet_Currency_Gem1x inline-gems"/>'
button.btn.btn-xs(ng-hide="ownsSet('background',#{JSON.stringify(bgs)})",ng-click="unlock(setKeys('background',#{JSON.stringify(bgs)}))")!= env.t('unlockSet',{cost:15}) + ' <span class="Pet_Currency_Gem1x inline-gems"/>'
each bg,k in bgs
button.customize-option(type='button',class='background_#{k}',ng-click='unlock("background.#{k}")',popover-title=bg.text(),popover=bg.notes(),popover-trigger='mouseenter')
script(id='partials/options.profile.html', type="text/ng-template")
ul.options-menu