Merge branch 'mmarschall-different-icons-for-start-and-due-date' into devel

Different icons for start and due date. Thanks to mmarschall !
Closes #1414
This commit is contained in:
Lauri Ojansivu 2018-01-06 15:34:31 +02:00
commit ccb14beb83
3 changed files with 28 additions and 8 deletions

View file

@ -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:

View file

@ -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() {

View file

@ -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
margin-right: 0.3em