From 3d7ceea9c6a06562d1cc540733b9783a7d8f2db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= <glasnak@wezeo.com>
Date: Tue, 20 Dec 2022 00:14:24 +0100
Subject: [PATCH] Merge

---
 app/public/mock/v1/overview/tasks.GET.json   | 14 ++------------
 app/src/plugins/app@vendor/vue-cal/event.vue |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/app/public/mock/v1/overview/tasks.GET.json b/app/public/mock/v1/overview/tasks.GET.json
index fedcc85..7d4a1ca 100644
--- a/app/public/mock/v1/overview/tasks.GET.json
+++ b/app/public/mock/v1/overview/tasks.GET.json
@@ -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"
 			},
 
 			{
diff --git a/app/src/plugins/app@vendor/vue-cal/event.vue b/app/src/plugins/app@vendor/vue-cal/event.vue
index 9e856f1..9d62a0f 100644
--- a/app/src/plugins/app@vendor/vue-cal/event.vue
+++ b/app/src/plugins/app@vendor/vue-cal/event.vue
@@ -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
 			}