Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2017-06-17 10:31:29 +02:00 коммит произвёл Julius Härtl
Родитель 2063e1d9f4
Коммит 0ffb8a0dbd
4 изменённых файлов: 11 добавлений и 12 удалений

Просмотреть файл

@ -481,24 +481,23 @@ button.button-inline:hover {
}
.due.now {
background-color: #fbd850;
color: #000;
}
.due.next {
background-color: #22ac2a;
color: #fff;
}
.due .icon-calendar {
background-image: url(../img/calendar.svg);
.due .badge-icon {
background-image: url(../../../core/img/places/calendar-dark.svg);
margin-right: 2px;
}
.overdue .icon-calendar {
.overdue .badge-icon {
background-image: url(../img/calendar-white.svg);
}
.now .icon-calendar {
background-image: url(../img/calendar.svg);
.now .badge-icon {
background-image: url(../../../core/img/places/calendar-dark.svg);
}
.next .icon-calendar {
.next .badge-icon {
background-image: url(../img/calendar-white.svg);
}
/**
@ -538,7 +537,7 @@ button.button-inline:hover {
margin-bottom: 10px;
}
#card-meta #duedate {
#card-meta .duedate {
display: flex;
}
#card-description {

Просмотреть файл

@ -38,7 +38,7 @@ Util::addScript('deck', 'vendor/angular-markdown-it/dist/ng-markdownit.min');
Util::addScript('deck', 'vendor/markdown-it-link-target/dist/markdown-it-link-target.min');
Util::addScript('deck', 'vendor/jquery-timepicker/jquery.ui.timepicker');
if(true && !\OC::$server->getConfig()->getSystemValue('debug', false)) {
if(!\OC::$server->getConfig()->getSystemValue('debug', false)) {
Util::addScript('deck', 'public/app');
} else {
// Load seperate JS files when debug mode is enabled

Просмотреть файл

@ -69,7 +69,7 @@
<div class="card-controls">
<i class="icon icon-filetype-text" ng-if="c.description" title="{{ c.description }}"></i>
<span class="due" ng-if="c.duedate" ng-class="{'overdue': c.overdue == 3, 'now': c.overdue == 2, 'next': c.overdue == 1 }">
<i class="icon icon-calendar"></i>
<i class="icon badge-icon"></i>
<span data-timestamp="{{ c.duedate | dateToTimestamp }}" class="live-relative-timestamp">{{ c.duedate | relativeDateFilterString }}</span>
</span>
<div class="app-popover-menu-utils" ng-if="!boardservice.isArchived()">

Просмотреть файл

@ -46,10 +46,10 @@
</ui-select-choices>
</ui-select>
<div id="duedate">
<div class="duedate">
<input class="datepicker-input medium focus" type="text" placeholder="Set a due date" value="{{ cardservice.getCurrent().duedate | parseDate }}" datepicker="due" />
<input class="timepicker-input medium focus" type="text" placeholder="00:00:00" ng-if="cardservice.getCurrent().duedate" value="{{ cardservice.getCurrent().duedate | parseTime }}" timepicker="due" />
<button class="icon icon-delete button-inline" title="Remove duedate" ng-if="cardservice.getCurrent().duedate" ng-click="resetDuedate()"></button>
<button class="icon icon-delete button-inline" title="<?php p($l->t('Remove due date')); ?>" ng-if="cardservice.getCurrent().duedate" ng-click="resetDuedate()"></button>
</div>
</div>