Merge branch 'edge' into meteor-1.8

This commit is contained in:
Lauri Ojansivu 2019-04-08 10:33:24 +03:00
commit 076dda8bd3
10 changed files with 25 additions and 14 deletions

View file

@ -22,15 +22,16 @@ template(name="boardList")
i.fa.js-star-board(
class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}"
title="{{_ 'star-board-title'}}")
i.fa.js-clone-board(
class="fa-clone"
title="{{_ 'duplicate-board'}}")
p.board-list-item-desc= description
if hasSpentTimeCards
i.fa.js-has-spenttime-cards(
class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}")
i.fa.js-clone-board(
class="fa-clone"
title="{{_ 'duplicate-board'}}")
p.board-list-item-desc= description
template(name="boardListHeaderBar")
h1 {{_ 'my-boards'}}

View file

@ -93,6 +93,7 @@ $spaceBetweenTiles = 16px
.is-star-active
color: white
.fa-clone
position: absolute;
bottom: 0