sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-20 04:38:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6200 from gauthamchandra/feature/quick-checkout-from-dailies

Browse source 
User can now check out of inn from tasks page
This commit is contained in:
Blade Barringer 2015-11-11 20:49:35 -06:00
commit efd0e2333e
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/dist/sprites/habitrpg-shared.css vendored
View file

File diff suppressed because one or more lines are too long

2
website/public/css/tasks.styl
View file

@ -196,6 +196,8 @@ for $stage in $stages
// ------------------------
.dailiesRestingInInn
clear: both
button
margin-top 10px
// an individual task entry
// ------------------------

3
website/views/shared/tasks/index.jade
View file

@ -22,6 +22,9 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
alert.alert-warning.dailiesRestingInInn(ng-if='list.type == "daily" && user.preferences.sleep && !$state.includes("options.social.challenges")')
i.glyphicon.glyphicon-warning-sign  
=env.t('dailiesRestingInInn')
button.btn-block.btn.btn-lg.btn-success(ng-click='User.user.ops.sleep({})')
| {{env.t('innCheckOut')}}
+taskColumnTabs('top')