sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4299 from pollockjj/develop

Browse source 
Solution for: Differentiate Locked and Unlocked Backgrounds (#4261)
This commit is contained in:
Blade Barringer 2014-11-30 18:41:51 -06:00
commit 632d0fdf5d
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
public/css/customizer.styl
View file

@ -65,4 +65,24 @@ menu
.well.limited-edition
padding: 5px
margin: 25px 0 0
margin: 25px 0 0
.background-unlocked
border 15px solid white
width: 170px !important
height: 177px !important
.background-locked
border 15px solid gray
width: 170px !important
height: 177px !important
.background-locked
position: relative
.background-locked i
position: absolute;
right: -13px;
bottom: -13px;
color: white;
top: auto;

7
views/options/profile.jade
View file

@ -191,8 +191,8 @@ mixin profileStats
td= env.t('allocatePer') + ' {{user.stats.per}}'
td
a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("per")', popover-trigger='mouseenter', popover-placement='right', popover=env.t('allocatePerPop')) +
div(ng-class='user.flags.classSelected && !user.preferences.disableClasses ? "col-md-4" : "col-md-6"')
button.btn.btn-default(ng-if='user.preferences.disableClasses', ng-click='user.ops.changeClass({})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('enableClassPop'))= env.t('enableClass')
hr(ng-if='user.preferences.disableClasses')
@ -253,7 +253,8 @@ mixin backgrounds(mobile)
//-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')
button.customize-option(type='button', class='background_#{k}', ng-class="user.purchased.background.#{k} ? 'background-unlocked' : 'background-locked'", ng-click='unlock("background.#{k}")', popover-title=bg.text(), popover=bg.notes(),popover-trigger='mouseenter')
i.glyphicon.glyphicon-lock(ng-if="!user.purchased.background.#{k}")
- }
script(type='text/ng-template', id='partials/options.profile.backgrounds.html')