sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'anowlcalledjosh/add-task-fix' into develop

Browse source
This commit is contained in:
Sabe Jones 2016-01-20 14:27:21 -05:00
commit 016b080836
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -189,11 +189,6 @@ for $stage in $stages
border: 0
float: right
font-size: 0.85em
.empty-task-notification
// @TODO: This causes weird centering behavior (see #6332)
// however, this is required to show the tooltip on the task button
// Figure out how to fix the centering behavior while preserving the tooltip
height: 100%;
// message in Dailies column when Resting in Inn
// ------------------------

6
website/views/shared/tasks/task_view/add_new.jade
View file

@ -2,9 +2,9 @@ form.task-add(name='new{{list.type}}form', ng-hide='obj._locked', ng-submit='add
textarea(rows='6', focus-element='list.bulk && list.focus', ng-model='list.newTask', placeholder='{{list.placeHolderBulk}}', ng-if='list.bulk', ui-keydown='{"meta-enter ctrl-enter":"addTask(obj[list.type+\'s\'],list)"}', required)
input(type='text', focus-element='!list.bulk && list.focus', ng-model='list.newTask', placeholder='{{list.placeHolder}}', ng-if='!list.bulk', required)
button(type='submit', ng-disabled='new{{list.type}}form.$invalid')
div.empty-task-notification( ng-show='new{{list.type}}form.$invalid', tooltip=env.t("emptyTask") )
span.glyphicon.glyphicon-plus
span.glyphicon.glyphicon-plus(ng-show='!new{{list.type}}form.$invalid')
div(ng-show='new{{list.type}}form.$invalid', tooltip=env.t("emptyTask"))
span.glyphicon.glyphicon-plus
span.glyphicon.glyphicon-plus(ng-show='!new{{list.type}}form.$invalid')
small.help-block.btn-link.pull-right(ng-click='toggleBulk(list)')
span(ng-if='!list.bulk')=env.t('addmultiple')
span(ng-if='list.bulk')=env.t('addsingle')