ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix relative timestamp and alignment in deleted items list

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-11-22 18:24:19 +01:00
parent c429ba5aff
commit d04f8742a6
2 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
css/style.scss
View File

@@ -1288,10 +1288,16 @@ input.input-inline {
.board-detail__deleted-list__item { .board-detail__deleted-list__item {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between;
* { * {
flex-basis: 20%; flex-basis: 44px;
}
.title {
flex-grow: 2;
}
.live-relative-timestamp {
flex-grow: 1;
} }
} }

13
templates/part.board.sidebarView.php
View File

@@ -127,11 +127,9 @@
<ul class='board-detail__deleted-list'> <ul class='board-detail__deleted-list'>
<li class='board-detail__deleted-list__item' ng-repeat="deletedStack in stackservice.deleted"> <li class='board-detail__deleted-list__item' ng-repeat="deletedStack in stackservice.deleted">
<span class="icon icon-deck"></span> <span class="icon icon-deck"></span>
<span>{{deletedStack.title}}</span> <span class="title">{{deletedStack.title}}</span>
<span>{{deletedStack.deletedAt | relativeDateFilter }}</span> <span class="live-relative-timestamp" data-timestamp="{{ deletedStack.deletedAt*1000 }}">{{deletedStack.deletedAt | relativeDateFilter }}</span>
<a ng-click="stackUndoDelete(deletedStack)"> <a ng-click="stackUndoDelete(deletedStack)"><span class="icon icon-history"></span></a>
<span class="icon icon-history"></span>
</a>
</li> </li>
</ul> </ul>
@@ -140,9 +138,8 @@
<ul class='board-detail__deleted-list'> <ul class='board-detail__deleted-list'>
<li class='board-detail__deleted-list__item' ng-repeat="deletedCard in cardservice.deleted"> <li class='board-detail__deleted-list__item' ng-repeat="deletedCard in cardservice.deleted">
<span class="icon icon-deck"></span> <span class="icon icon-deck"></span>
<span>{{deletedCard.title}}</span> <span class="title">{{deletedCard.title}} ({{stackservice.tryAllThenDeleted(deletedCard.stackId).title}})</span>
<span>{{stackservice.tryAllThenDeleted(deletedCard.stackId).title}}</span> <span class="live-relative-timestamp" data-timestamp="{{ deletedCard.deletedAt*1000 }}">{{deletedCard.deletedAt | relativeDateFilter }}</span>
<span>{{deletedCard.deletedAt | relativeDateFilter }}</span>
<a ng-click="cardOrCardAndStackUndoDelete(deletedCard)"> <a ng-click="cardOrCardAndStackUndoDelete(deletedCard)">
<span class="icon icon-history"></span> <span class="icon icon-history"></span>
</a> </a>