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

Added double columns to edit modal (#8456)

Browse source 
* Added double columns to edit modal

* Fixed task notes z index and border styles

* Moved tags to right column and updated min width
This commit is contained in:
Keith Holliday 2017-01-31 12:05:49 -07:00 committed by GitHub
parent d5511a0047
commit e124c36274
6 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
website/client-old/css/shared.styl
View file

@ -115,3 +115,6 @@ li.spaced
.slight-right-margin
margin-right: 1em
.modal-footer
border: none

6
website/client-old/css/tasks.styl
View file

@ -51,6 +51,8 @@ taskContainerStyles($stage)
background-color: $stage[1]
.option-group:not(.task-checklist)
border-bottom: 1px solid darken($stage[1], 15%)
hr
border-bottom: 1px solid darken($stage[1], 15%)
.option-content
border-color: darken($stage[1], 16.18%) !important
&:hover
@ -727,3 +729,7 @@ form
// Add padding to exp-chart
.exp-chart
padding-bottom: 10px
.task-extra-notes
z-index: 10
position: relative

2
website/views/shared/modals/tasks-edit.jade
View file

@ -1,5 +1,5 @@
script(type='text/ng-template', id='modals/task-edit.html')
.modal-content.task-modal(style='min-width:28em', class='{{taskStatus}}', id="task-{{task._id}}")
.modal-content.task-modal(style='min-width:22em', class='{{taskStatus}}', id="task-{{task._id}}")
.modal-body.text-center(style='padding-bottom:0')
| {{scope}}
include ../tasks/edit/index

4
website/views/shared/tasks/edit/advanced_options.jade
View file

@ -9,8 +9,8 @@ div(ng-if='(task.type !== "reward") || (!obj.auth && obj.purchased && obj.purcha
a.hint(href='http://habitica.wikia.com/wiki/Task_Alias', target='_blank', popover-trigger='mouseenter', popover="{{::env.t('taskAliasPopover')}} {{::task._edit.alias ? '\n\n\' + env.t('taskAliasPopoverWarning') : ''}}")=env.t('taskAlias')
input.form-control(ng-model='task._edit.alias' type='text' placeholder=env.t('taskAliasPlaceholder'))
fieldset.option-group.advanced-option(ng-show="task._edit._advanced")
group-tasks-actions(ng-if="!obj.auth && obj.purchased && obj.purchased.active", task='task', group='obj')
fieldset.option-group.advanced-option(ng-show="task._edit._advanced", ng-if="!obj.auth && obj.purchased && obj.purchased.active")
group-tasks-actions(task='task', group='obj')
div(ng-show='task._edit._advanced')
div(ng-if='::task.type == "daily"')

31
website/views/shared/tasks/edit/index.jade
View file

@ -43,21 +43,26 @@ div(ng-if='task._editing')
include ./checklist
form
include ./text_notes
.col-md-6
include ./text_notes
include ./habits/plus_minus
include ./habits/plus_minus
include ./dailies/calendar
include ./dailies/calendar
include ./rewards/pricing
include ./rewards/pricing
include ./todos/due_date
include ./todos/due_date
include ./tags
include ./advanced_options
.save-close
button(type='submit', ng-click='saveTask(task,false,true); $close()')=env.t('saveAndClose')
.save-close
button(ng-click='cancelTaskEdit(task); $close()')=env.t('cancel')
.col-md-6
include ./tags
include ./advanced_options
.col-md-12
hr
.save-close
button(type='submit', ng-click='saveTask(task,false,true); $close()')=env.t('saveAndClose')
.save-close
button(ng-click='cancelTaskEdit(task); $close()')=env.t('cancel')

2
website/views/shared/tasks/edit/text_notes.jade
View file

@ -4,4 +4,4 @@ fieldset.option-group
fieldset.option-group
label.option-title=env.t('extraNotes')
textarea.form-control(rows='3', ng-model='task._edit.notes')
textarea.form-control.task-extra-notes(rows='3', ng-model='task._edit.notes')