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

Changed empty task messageand added style.

Browse source
This commit is contained in:
kholliday 2015-03-23 20:18:14 -05:00
parent 9a157eea8c
commit e5cd319ef5
3 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/locales/en/tasks.json
View file

@ -78,5 +78,5 @@
"streakCoins": "Streak Bonus!",
"pushTaskToTop": "Push task to top",
"pushTaskToBottom": "Push task to bottom",
"emptyTask": "Please enter a <%= taskType %>."
"emptyTask": "Enter the task's title first."
}

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

@ -57,7 +57,7 @@ for $stage in $stages
&:focus
border-color: darken($stage[1], 61.8%) !important
outline: none;
// completed has to be outside the loop to override the color class
.completed
color: darken($completed,30%)
@ -105,18 +105,18 @@ for $stage in $stages
.reward, .reward-item
background-color: white
border: 1px solid $completed !important
border: 1px solid $completed !important
// 2. Columns & Tasks
// ===================
.tasks-lists
.row
margin-left: -5px
margin-right: -5px
.col-md-3
.col-md-3
padding-left: 10px // Override Bootstrap 15px padding
padding-right: 10px // Override Bootstrap 15px padding
margin-bottom: 15px
@ -137,7 +137,7 @@ for $stage in $stages
font-weight: 300
// 50% width columns with scrollbars for tablets
@media (min-width: 768px) and (max-width: 970px)
@media (min-width: 768px) and (max-width: 970px)
.task-column
max-height: 18.6em
overflow-y: scroll
@ -171,6 +171,8 @@ for $stage in $stages
border: 0
float: right
font-size: 0.85em
.empty-task-notification
height: 100%;
// an individual task entry
// ------------------------
@ -189,7 +191,7 @@ for $stage in $stages
label
font-weight: 400
input[type="text"], input[type="number"], textarea.option-content
border: 1px solid #aaa
border-radius: 0.382em
@ -351,7 +353,7 @@ for $stage in $stages
a
text-decoration: none
// improve alignment of task icons
.glyphicon-signal
margin-left: 0.25em
@ -483,7 +485,7 @@ form
.task-options
.task-action-btn.tile
margin: 3px
form
padding-bottom: 1em
.priority-multiplier, .task-attributes, .repeat-days
@ -498,24 +500,24 @@ form
.repeat-days
li
button
min-width: 2.5em
min-width: 2.5em
.save-close
text-align: center
@extend $hrpg-button
// Habits – task button styles (+ -)
.habits
.task-actions
width: 3em
height: 100%
a
display: block
width: 100%
height: 100%
position: relative
font-size: 0.8em
span
position: absolute
margin: auto
@ -526,7 +528,7 @@ form
left: 0
bottom: 0
right: 0
&:hover, &:focus
color: #222
text-decoration: none
@ -576,14 +578,14 @@ form
line-height: 1.5
float: left
padding: 0.25em 0.5em
li
margin-bottom: 1em
&:hover .checklist-icon
opacity:1
// Task filters
// --------
// --------
.task-filter
margin: 1.5em 0 1em 0
hrpg-button-bar-mixin($color-tasks)
@ -594,7 +596,7 @@ form
hrpg-button-color-mixin($color-tasks)
width: 33.333%
text-align: center
&:nth-child(3n + 1):nth-last-child(2),
&:nth-child(3n + 1):nth-last-child(2),
&:nth-child(3n + 1):nth-last-child(2) + li
width: 50%;
a
@ -605,7 +607,7 @@ form
min-height: 3.07em // Temp fix for slight misalignment of btn-buy
.task-filter
li:nth-child(3n + 1):nth-last-child(2)
width: 33.333%
width: 33.333%
li:nth-child(3n + 1):nth-last-child(2) + li
width: 66.666%
.btn-buy
@ -619,7 +621,7 @@ form
&:only-child
position: static
padding-left: 0.75em
&.highValue // If reward value exceeds three digits, drop the number below the coin icon
padding: 0.3em
text-align: center
@ -628,4 +630,4 @@ form
margin: auto
.shop_gold + .reward-cost
line-height: 1
top: -0.1em
top: -0.1em

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

@ -27,7 +27,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
textarea(rows='6', task-focus='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', task-focus='!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( ng-show='new{{list.type}}form.$invalid', tooltip=env.t("emptyTask", {taskType: "{{list.type}}"}) )
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')
small.help-block.btn-link.pull-right(ng-click='toggleBulk(list)')