From c938cb37f1725ef474726906e70bc4e5b5a72d93 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 22 Nov 2017 11:54:31 -0700 Subject: [PATCH] * Calendar - add a line to the top of events so consecutive events are better separated --- calendar/js/et2_widget_event.js | 2 +- calendar/templates/pixelegg/app.css | 3 ++- calendar/templates/pixelegg/app.less | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js index 7d144d8a93..234a8ecd87 100644 --- a/calendar/js/et2_widget_event.js +++ b/calendar/js/et2_widget_event.js @@ -333,7 +333,7 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten if(jQuery.Color("rgba(0,0,0,0)").toRgbaString() != jQuery.Color(this.div,'background-color').toRgbaString()) { // Most statuses use colored borders - this.div.css('border-color',status_class === 'calendar_calEventAllAccepted' ? this.div.css('background-color') : ''); + this.div.css('border-color',this.div.css('background-color') ); } this.icons.appendTo(this.title) diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index 68a3179a6d..d6a1e7872d 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -2123,7 +2123,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget * border-color: depending on category * background: depending on category (shade) */ - background-color: #679FD2; + background-color: #679fd2; + border-top: 1px solid; } .calendar_calEvent:not([class*=" cat_"]) { /* Defaults for no category, so we don't override it */ diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index 862f349c01..1f819046f8 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -766,6 +766,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget * background: depending on category (shade) */ background-color: @egw_color_blue_lightest; + + border-top: 1px solid; } .calendar_calEvent:not([class*=" cat_"]) { /* Defaults for no category, so we don't override it */