mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
Merge
This commit is contained in:
1 parent
6a8afc2dc4
commit
3d7ceea9c6
2 files changed
+3
-13
No files matched your search
@@ -96,16 +96,6 @@
|
||||
"master_task_color": "#FDE1FF"
|
||||
},
|
||||
|
||||
{
|
||||
"id": 5,
|
||||
"task_id": 5,
|
||||
"starts_at": "2022-12-20T09:00:00+00:00",
|
||||
"ends_at": "2022-12-20T12:00:00+00:00",
|
||||
"title": "Task 5",
|
||||
"is_blocker": true,
|
||||
"master_task_color": null
|
||||
},
|
||||
|
||||
{
|
||||
"id": 6,
|
||||
"task_id": 6,
|
||||
@@ -113,7 +103,7 @@
|
||||
"ends_at": "2022-12-20T12:00:00+00:00",
|
||||
"title": "Task 6",
|
||||
"project_code": "CO-2201",
|
||||
"master_task_color": "#E9FFE6"
|
||||
"master_task_color": "#57e0f2"
|
||||
},
|
||||
|
||||
{
|
||||
@@ -133,7 +123,7 @@
|
||||
"ends_at": "2022-12-19T09:00:00+00:00",
|
||||
"title": "Task 8",
|
||||
"project_code": "CO-2201",
|
||||
"master_task_color": "#E7DBF8"
|
||||
"master_task_color": "#57e0f2"
|
||||
},
|
||||
|
||||
{
|
||||
|
||||
@@ -275,7 +275,7 @@ export default {
|
||||
let background = this.event.master_task_color;
|
||||
|
||||
if (Array.isArray(this.cellOverlaps.sameOverlaps) && this.cellOverlaps.sameOverlaps.length) {
|
||||
width = 50
|
||||
width = 46
|
||||
left = 50 * this.eventPosition
|
||||
zIdnex = 10
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user