sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-26 21:24:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct styling for focusable buttons

Browse source 
Fixes #5767
This commit is contained in:
Blade Barringer 2015-08-11 18:34:46 -05:00
parent 8360aa93fb
commit a29dd4cc16
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ for $stage in $stages
background-color: darken($stage[1], 30%) background-color: darken($stage[1], 30%)
&:hover, &:focus &:hover, &:focus
background-color: darken($stage[1], 40%) background-color: darken($stage[1], 40%)
input[type=checkbox]:focus + label, input.habit:focus + a input[type=checkbox].task-input:focus + label, input.habit:focus + a
background-color: darken($stage[1], 40%) background-color: darken($stage[1], 40%)
.task-actions a:nth-of-type(2) .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 border-top: 1px solid darken($stage[1],50%) // If there are two habit buttons (+ -), add a border to separate them

15
website/views/shared/tasks/task_view/index.jade
View file

@ -4,15 +4,13 @@
// Habits // Habits
.task-actions(ng-if='::task.type=="habit"') .task-actions(ng-if='::task.type=="habit"')
// score() is overridden in challengesCtrl to do nothing // score() is overridden in challengesCtrl to do nothing
input.visuallyhidden( input.task-input.habit.visuallyhidden(
class="habit",
ng-if='task.up', ng-if='task.up',
type='checkbox', type='checkbox',
ui-keypress='{ 13:"score(task, \'up\')" }' ) ui-keypress='{ 13:"score(task, \'up\')" }' )
a(ng-if='task.up', ng-click='applyingAction || score(task,"up")') a(ng-if='task.up', ng-click='applyingAction || score(task,"up")')
span.glyphicon.glyphicon-plus span.glyphicon.glyphicon-plus
input.visuallyhidden( input.task-input.habit.visuallyhidden(
class="habit",
ng-if='task.down', ng-if='task.down',
type='checkbox', type='checkbox',
ui-keypress='{ 13:"score(task, \'down\')" }' ) ui-keypress='{ 13:"score(task, \'down\')" }' )
@ -21,8 +19,7 @@
// Rewards // Rewards
span(ng-if='::task.type=="reward"') span(ng-if='::task.type=="reward"')
input.visuallyhidden( input.task-input.reward.visuallyhidden(
class="reward",
type='checkbox', type='checkbox',
ui-keypress='{ 13:"score(task, \'down\')" }' ) ui-keypress='{ 13:"score(task, \'down\')" }' )
a.money.btn-buy(ng-class='{highValue: task.value >= 1000}', ng-click='score(task, "down")') a.money.btn-buy(ng-class='{highValue: task.value >= 1000}', ng-click='score(task, "down")')
@ -31,11 +28,11 @@
// Daily & Todos // Daily & Todos
span.task-checker.action-yesno(ng-if='::task.type=="daily" || task.type=="todo"') span.task-checker.action-yesno(ng-if='::task.type=="daily" || task.type=="todo"')
input.visuallyhidden.focusable(id='box-{{::obj._id}}_{{::task.id}}', type='checkbox', input.task-input.visuallyhidden.focusable(id='box-{{::obj._id}}_{{::task.id}}', type='checkbox',
ng-model='task.completed', ng-if='$state.includes("tasks")', ng-model='task.completed', ng-if='$state.includes("tasks")',
ng-change='task.type=="todo" && pushTask(task,$index,"bottom"); changeCheck(task)' ng-change='task.type=="todo" && pushTask(task,$index,"bottom"); changeCheck(task)'
ui-keypress='{13:"task.completed = !task.completed; changeCheck(task)"}' ) ui-keypress='{13:"task.completed = !task.completed; changeCheck(task)"}' )
input.visuallyhidden.focusable(id='box-{{::obj._id}}_{{::task.id}}', type='checkbox', input.visuallyhidden.focusable(id='box-{{::obj._id}}_{{::task.id}}', type='checkbox',
ng-if='!$state.includes("tasks")') ng-if='!$state.includes("tasks")')
label(for='box-{{::obj._id}}_{{::task.id}}') label(for='box-{{::obj._id}}_{{::task.id}}')