Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 19:24:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-09-25 19:59:13 +03:00
parent 2bb56a1611
commit f7c8518cd0
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
resources/views/tasks/time_tracker.blade.php
View File

@ -20,6 +20,14 @@
outline: none; outline: none;
} }
.fade-color {
animation-name: fadeToYellow;
}
.list-group-item {
animation-duration: .5s;
}
.list-group-item.active { .list-group-item.active {
background-color: #f8f8f8 !important; background-color: #f8f8f8 !important;
color: black !important; color: black !important;
@ -29,6 +37,15 @@
border-color: #fff !important; border-color: #fff !important;
} }
.list-group-item.changed {
background-color: #ffffaa !important;
}
@keyframes fadeToYellow {
from {background-color: #f8f8f8}
to {background-color: #ffffaa}
}
.list-group-item.active .list-group-item-text, .list-group-item.active .list-group-item-text,
.list-group-item.active:focus .list-group-item-text, .list-group-item.active:focus .list-group-item-text,
.list-group-item.active:hover .list-group-item-text { .list-group-item.active:hover .list-group-item-text {

7
resources/views/tasks/time_tracker_knockout.blade.php
View File

@ -198,7 +198,7 @@
} }
self.filterStyle = ko.computed(function() { self.filterStyle = ko.computed(function() {
return 'background-color: ' + (self.filter() ? '#fff68f' : 'white') + ' !important'; return 'background-color: ' + (self.filter() ? '#ffffaa' : 'white') + ' !important';
}); });
self.statistics = ko.computed(function() { self.statistics = ko.computed(function() {
@ -432,7 +432,6 @@
} else { } else {
data += '&is_running=0'; data += '&is_running=0';
} }
console.log(data);
$.ajax({ $.ajax({
dataType: 'json', dataType: 'json',
type: method, type: method,
@ -590,6 +589,10 @@
var str = ''; var str = '';
if (self == model.selectedTask()) { if (self == model.selectedTask()) {
str = 'active'; str = 'active';
if (! self.public_id() || model.formChanged()) {
str += ' changed fade-color';
}
} }
if (! self.project()) { if (! self.project()) {
return str; return str;