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

fix final bit of conflict

Browse source
This commit is contained in:
Alice Harris 2015-01-11 14:54:41 +10:00
parent 7660141365
commit 7b9514dc5d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
views/shared/tasks/lists.jade
View file

@ -25,7 +25,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
// Add New // Add New
form.task-add(name='new{{list.type}}form', ng-hide='obj._locked', ng-submit='addTask(obj[list.type+"s"],list)') form.task-add(name='new{{list.type}}form', ng-hide='obj._locked', ng-submit='addTask(obj[list.type+"s"],list)')
input(type='text', ng-model='list.newTask', placeholder='{{list.placeHolder}}', required) input(type='text', ng-model='list.newTask', placeholder='{{list.placeHolder}}', required)
input.addtask-btn(type='submit', value='＋', ng-disabled='new{{list.type}}form.$invalid') button(type='submit', ng-disabled='new{{list.type}}form.$invalid')
span.glyphicon.glyphicon-plus span.glyphicon.glyphicon-plus
mixin taskColumnTabs(position) mixin taskColumnTabs(position)