From 6358d0ebfacce420090c294f23d098fe38cc2871 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Sun, 2 Jun 2019 07:44:21 +0000
Subject: [PATCH] Calendar: Fix white on white color for itip event preview

---
 plugins/calendar/calendar_ui.js                      |  3 +--
 plugins/libcalendaring/libcalendaring.js             |  5 +++++
 plugins/libkolab/skins/elastic/include/calendar.less | 12 +++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index b0688c3f..6285f6eb 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -3684,8 +3684,7 @@ function rcube_calendar_ui(settings)
     if (rcmail.env.itip_events && rcmail.env.itip_events.length) {
       me.calendars['--invitation--itip'] = {
         events: rcmail.env.itip_events,
-        color: '#fff',
-        textColor: '#333',
+        color: 'ffffff',
         editable: false,
         rights: 'lrs',
         attendees: true
diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js
index a8a4d54d..0cd41260 100644
--- a/plugins/libcalendaring/libcalendaring.js
+++ b/plugins/libcalendaring/libcalendaring.js
@@ -348,6 +348,11 @@ function rcube_libcalendaring(settings)
         if (!color_map[color]) {
             color_map[color] = '#fff';
 
+            // Convert 3-char to 6-char
+            if (/^#?([a-f0-9]{1})([a-f0-9]{1})([a-f0-9]{1})$/i.test(color)) {
+                color = '#' + RegExp.$1 + RegExp.$1 + RegExp.$2 + RegExp.$2 + RegExp.$3 + RegExp.$3;
+            }
+
             if (/^#?([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i.test(color)) {
                 // use information about brightness calculation found at
                 // http://javascriptrules.com/2009/08/05/css-color-brightness-contrast-using-javascript/
diff --git a/plugins/libkolab/skins/elastic/include/calendar.less b/plugins/libkolab/skins/elastic/include/calendar.less
index fe1d61f0..fc1ff201 100644
--- a/plugins/libkolab/skins/elastic/include/calendar.less
+++ b/plugins/libkolab/skins/elastic/include/calendar.less
@@ -322,16 +322,10 @@ fieldset.categories .input-group {
             margin-top: 1.1rem;
         }
 
-        &.fc-invitation-needs-action {
-            border: 1px dashed #5757c7;
-        }
-
-        &.fc-invitation-tentative {
-            border: 1px dashed #eb8900;
-        }
-
+        &.fc-invitation-needs-action,
+        &.fc-invitation-tentative,
         &.fc-invitation-declined {
-            border: 1px dashed #c00;
+            border: 1px dashed #999;
         }
 
         &.fc-event-ns-other.fc-invitation-declined {