From 85ba1bd127f2d2490545aee83f0925f9efc8420e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 3 Apr 2018 13:50:19 +0200
Subject: [PATCH] Elastic: Calendar improvements

---
 .../skins/elastic/include/calendar.less       | 47 +++++++++++++------
 plugins/libkolab/skins/elastic/libkolab.less  | 25 ++--------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/plugins/libkolab/skins/elastic/include/calendar.less b/plugins/libkolab/skins/elastic/include/calendar.less
index b19c024c..db97e47d 100644
--- a/plugins/libkolab/skins/elastic/include/calendar.less
+++ b/plugins/libkolab/skins/elastic/include/calendar.less
@@ -399,7 +399,6 @@ body.quickview-active .fc-content {
         tr.fc-last th,
         tr.fc-last td {
             border-bottom-width: 1px;
-            color: @color-black-shade-text;
         }
 
         tbody tr.fc-first td,
@@ -428,6 +427,10 @@ body.quickview-active .fc-content {
         vertical-align: top;
     }
 
+    .fc-day-header {
+        color: @color-black-shade-text;
+    }
+
     .fc-grid {
         th {
             text-align: center;
@@ -475,8 +478,14 @@ body.quickview-active .fc-content {
 
     // Agenda Week View, Agenda Day View
 
-    .fc-agenda-days th {
-        text-align: center;
+    .fc-agenda-days {
+        th {
+            text-align: center;
+        }
+
+        .fc-widget-header {
+            color: @color-black-shade-text;
+        }
     }
 
     .fc-agenda {
@@ -656,17 +665,29 @@ body.quickview-active .fc-content {
         padding: 4px 2px;
         border-width: 0;
         border-bottom-width: 1px;
+
+        .fc-event {
+            position: relative;
+            margin: 1px 2px 3px 2px;
+
+            td:not(.fc-event-handle) {
+                vertical-align: top;
+            }
+        }
+
+        .fc-event-time {
+            .overflow-ellipsis;
+        }
+
+        .fc-event-title {
+            font-weight: bold;
+        }
     }
 
     .fc-view-list .fc-last {
         border-bottom: 0;
     }
 
-    .fc-list-section .fc-event {
-        position: relative;
-        margin: 1px 2px 3px 2px;
-    }
-
     .fc-view-table {
         tr.fc-event {
             background: inherit;
@@ -678,7 +699,7 @@ body.quickview-active .fc-content {
             }
 
             td.fc-event-handle {
-                padding: 3px 8px 3px 3px;
+                padding: 3px 8px 3px 5px;
             }
         }
 
@@ -907,18 +928,13 @@ body.quickview-active .fc-content {
     }
 
     .fc-event-location {
-        font-size: 90%;
+        font-size: 100%;
     }
 
     .fc-agenda-slots td div {
         height: 1.4em;
     }
 
-    .fc-widget-header,
-    .fc-mon, .fc-tue, .fc-wed, .fc-thu, .fc-fri {
-        background-color: #fff;
-    }
-
     .fc-widget-header, .fc-widget-content {
         border-color: @color-calendar-border;
     }
@@ -1063,6 +1079,7 @@ body.task-calendar {
 
     .input-group-prepend {
         overflow: hidden;
+        margin-bottom: 0;
 
         span {
             display: block;
diff --git a/plugins/libkolab/skins/elastic/libkolab.less b/plugins/libkolab/skins/elastic/libkolab.less
index 238d6f31..94693839 100644
--- a/plugins/libkolab/skins/elastic/libkolab.less
+++ b/plugins/libkolab/skins/elastic/libkolab.less
@@ -142,25 +142,7 @@
             color: @color-list-selected;
             background-color: @color-list-selected-background;
         }
-/*
-        &.shared > div a:first-child {
-            padding-right: 1.6em;
 
-            &:after {
-                &:extend(.font-icon-class);
-                content: @fa-var-share-alt;
-            }
-        }
-
-        &.user > div a:first-child {
-            padding-right: 1.6em;
-
-            &:after {
-                &:extend(.font-icon-class);
-                content: @fa-var-user;
-            }
-        }
-*/
         & > div.readonly a:first-child,
         &.readonly:not(.virtual) > div a:first-child {
             padding-right: 1.6em;
@@ -171,12 +153,15 @@
             }
         }
 
-        & > div.virtual.user > .listname,
-        &.virtual.user > div a:first-child {
+        & > div.other.user > .listname,
+        &.other.user > div a:first-child {
             &:before {
                 .font-icon-solid(@fa-var-user);
             }
+        }
 
+        & > div.virtual.user > .listname,
+        &.virtual.user > div a:first-child {
             &:after {
                 display: none;
             }