From cd4062c9f1a34ae32d548905fb1e9652db621b3a Mon Sep 17 00:00:00 2001 From: Matthias Marschall Date: Thu, 4 Jan 2018 18:34:39 +0100 Subject: different icons for start and due date --- client/components/cards/cardDate.js | 14 ++++++++------ client/components/cards/cardDate.styl | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js index 3f69f384..abf6a42b 100644 --- a/client/components/cards/cardDate.js +++ b/client/components/cards/cardDate.js @@ -171,11 +171,12 @@ class CardStartDate extends CardDate { } classes() { + let classes = 'start-date' + ' '; if (this.date.get().isBefore(this.now.get(), 'minute') && this.now.get().isBefore(this.data().dueAt)) { - return 'current'; + classes += 'current'; } - return ''; + return classes; } showTitle() { @@ -200,13 +201,14 @@ class CardDueDate extends CardDate { } classes() { + let classes = 'due-date' + ' '; if (this.now.get().diff(this.date.get(), 'days') >= 2) - return 'long-overdue'; + classes += 'long-overdue'; else if (this.now.get().diff(this.date.get(), 'minute') >= 0) - return 'due'; + classes += 'due'; else if (this.now.get().diff(this.date.get(), 'days') >= -1) - return 'almost-due'; - return ''; + classes += 'almost-due'; + return classes; } showTitle() { diff --git a/client/components/cards/cardDate.styl b/client/components/cards/cardDate.styl index 1631baa5..e0c3fc9e 100644 --- a/client/components/cards/cardDate.styl +++ b/client/components/cards/cardDate.styl @@ -49,10 +49,20 @@ &:hover, &.is-active background-color: darken(#fd5d47, 7) + &.due-date + time + &::before + content: "\f090" // symbol: fa-sign-in + + &.start-date + time + &::before + content: "\f08b" // symbol: fa-sign-out + time &::before font: normal normal normal 14px/1 FontAwesome font-size: inherit -webkit-font-smoothing: antialiased - content: "\f017" // clock symbol - margin-right: 0.3em \ No newline at end of file + margin-right: 0.3em + -- cgit v1.2.3-1-g7c22 From 17bb4641078e5a5f05a63c3dc507a65427a0893b Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 6 Jan 2018 15:32:18 +0200 Subject: Different icons for start and due date. Thanks to mmarschall ! Closes #1414 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec5d9a7c..b077bdc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +This release adds the following new features: + +* [Different icons for start and due date](https://github.com/wekan/wekan/pull/1420). + +Thanks to GitHub user mmarschall for contributions. + # v0.63 2017-12-20 Wekan release This release adds the following new features: -- cgit v1.2.3-1-g7c22