summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-04-08 10:33:24 +0300
committerLauri Ojansivu <x@xet7.org>2019-04-08 10:33:24 +0300
commit076dda8bd3ad5e809fcf040ad27d8adbbdbbbf9c (patch)
tree721edc1af4f86238c4639cf2197a60ff1982563e /client
parentf2f13450b5bd0556776bff40f5ee4f5a959b5b84 (diff)
parenta43237d4f9a93381621f3f86f6b5701fce3c8d4d (diff)
downloadwekan-076dda8bd3ad5e809fcf040ad27d8adbbdbbbf9c.tar.gz
wekan-076dda8bd3ad5e809fcf040ad27d8adbbdbbbf9c.tar.bz2
wekan-076dda8bd3ad5e809fcf040ad27d8adbbdbbbf9c.zip
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client')
-rw-r--r--client/components/boards/boardsList.jade9
-rw-r--r--client/components/boards/boardsList.styl1
2 files changed, 6 insertions, 4 deletions
diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade
index 0da926ef..70b29c49 100644
--- a/client/components/boards/boardsList.jade
+++ b/client/components/boards/boardsList.jade
@@ -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'}}
diff --git a/client/components/boards/boardsList.styl b/client/components/boards/boardsList.styl
index 9f0b204e..7e834411 100644
--- a/client/components/boards/boardsList.styl
+++ b/client/components/boards/boardsList.styl
@@ -93,6 +93,7 @@ $spaceBetweenTiles = 16px
.is-star-active
color: white
+
.fa-clone
position: absolute;
bottom: 0