mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-03 08:21:07 +00:00
fix(tasks): vertically align habit buttons
* When a task has + and - buttons, display the buttons vertically and expand them to fill the full height of the task. * Use glyphicons for + and - icons
This commit is contained in:
parent
17ab1d660f
commit
2c88be85cf
2 changed files with 47 additions and 11 deletions
|
|
@ -36,11 +36,16 @@ for $stage in $stages
|
|||
&:focus
|
||||
border: 1px solid darken($stage[1],30%)
|
||||
outline: 0
|
||||
.task-actions
|
||||
background-color: darken($stage[1], 30%)
|
||||
.action-yesno label,
|
||||
.task-action-btn
|
||||
.task-action-btn,
|
||||
.task-actions a
|
||||
background-color: darken($stage[1], 30%)
|
||||
&:hover, &:focus
|
||||
background-color: darken($stage[1], 40%)
|
||||
.task-actions a:nth-of-type(2)
|
||||
border-top: 1px solid darken($stage[1],50%) // If there are two habit buttons (+ -), add a border to separate them
|
||||
.task-options
|
||||
background-color: $stage[1]
|
||||
.option-group:not(.task-checklist)
|
||||
|
|
@ -183,7 +188,7 @@ for $stage in $stages
|
|||
// task content
|
||||
.task-text
|
||||
display: block
|
||||
padding: 0.75em 0 0.75em 3.5em
|
||||
padding: 0.75em 0 0.75em 3.75em
|
||||
line-height: 1.4
|
||||
word-wrap: break-word
|
||||
|
||||
|
|
@ -196,11 +201,6 @@ for $stage in $stages
|
|||
background-size:1.5em
|
||||
vertical-align: middle
|
||||
|
||||
.habit-wide .task-text
|
||||
padding-left: 7em
|
||||
.habit-narrow .task-text
|
||||
padding-left: 0.75em
|
||||
|
||||
// when a task is being dragged
|
||||
.task.ui-sortable-helper
|
||||
box-shadow: 0 0 3px rgba(0,0,0,0.15), 0 0 5px rgba(0,0,0,0.1)
|
||||
|
|
@ -486,7 +486,41 @@ form
|
|||
min-width: 2.5em
|
||||
.save-close
|
||||
text-align: center
|
||||
@extend $hrpg-button
|
||||
@extend $hrpg-button
|
||||
|
||||
// Habits – task button styles (+ -)
|
||||
.habits
|
||||
.task-actions
|
||||
display: inline-block
|
||||
width: 3em
|
||||
height: 100%
|
||||
a
|
||||
display: table;
|
||||
width: 100%
|
||||
height: 100%
|
||||
font-size: 0.8em
|
||||
span
|
||||
display: table-cell
|
||||
text-align: center
|
||||
vertical-align: middle
|
||||
width: 100%
|
||||
height: 100%
|
||||
&:hover, &:focus
|
||||
color: #222
|
||||
text-decoration: none
|
||||
.habit-wide
|
||||
// When there are two buttons...
|
||||
min-height: 4.5em
|
||||
.task-actions
|
||||
a
|
||||
height: 50%
|
||||
.habit-narrow
|
||||
// When there are no buttons...
|
||||
.task-actions
|
||||
display: none
|
||||
.task-text
|
||||
padding-left: 1em
|
||||
|
||||
// todos ui
|
||||
// --------
|
||||
|
||||
|
|
|
|||
|
|
@ -61,10 +61,12 @@ li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s
|
|||
.task-controls.task-primary(ng-if='!task._editing')
|
||||
|
||||
// Habits
|
||||
span(ng-if='::task.type=="habit"')
|
||||
.task-actions(ng-if='::task.type=="habit"')
|
||||
// score() is overridden in challengesCtrl to do nothing
|
||||
a.task-action-btn(ng-if='task.up', ng-click='score(task,"up")') +
|
||||
a.task-action-btn(ng-if='task.down', ng-click='score(task,"down")') -
|
||||
a(ng-if='task.up', ng-click='score(task,"up")')
|
||||
span.glyphicon.glyphicon-plus
|
||||
a(ng-if='task.down', ng-click='score(task,"down")')
|
||||
span.glyphicon.glyphicon-minus
|
||||
|
||||
// Rewards
|
||||
span(ng-show='task.type=="reward"')
|
||||
|
|
|
|||
Loading…
Reference in a new issue