diff --git a/calendar/js/et2_widget_daycol.js b/calendar/js/et2_widget_daycol.js index afdb49a11d..0cd14c19ed 100644 --- a/calendar/js/et2_widget_daycol.js +++ b/calendar/js/et2_widget_daycol.js @@ -582,7 +582,7 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea } // Reset - event.title.css('top',''); + event.title.css({'top':'','background-color':''}); event.body.css('padding-top',''); var hidden = isHidden.call(this,event.div); if(!hidden) @@ -593,7 +593,10 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea // Bottom hidden is fine if(hidden.hidden === 'top' && !hidden.completely) { - event.title.css('top',timegrid.scrolling.scrollTop() - event.div.position().top); + event.title.css({ + 'top': timegrid.scrolling.scrollTop() - event.div.position().top, + 'background-color': 'transparent' + }); event.body.css('padding-top',timegrid.scrolling.scrollTop() - event.div.position().top); } // Too many in gridlist view, show indicator diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css index e307096cf8..16239b6761 100644 --- a/calendar/templates/default/app.css +++ b/calendar/templates/default/app.css @@ -46,7 +46,7 @@ background: inherit; } #calendar-sidebox_date .calendar_calHoliday a { - background-color: #dac0c0; + background-color: rgba(103, 159, 210, 0.5); } /* Toolbar */ @@ -156,14 +156,13 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget /* marks a day in the colum-header as holiday */ .calendar_calHoliday{ - background: #dac0c0; + background-color: rgba(103, 159, 210, 0.5); } /* marks a day in the column-header additionaly as birthday of some contact, * it should work together with the backgrounds of calendar_calToday, calendar_calHoliday, th, row_on and row_off */ .calendar_calBirthday,.calendar_calBirthday a{ color: #626161; - font-style: italic; } /* timeGridWidget, contains timeRow's and dayCol's @@ -611,9 +610,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget white-space: normal; background-color: rgba(255,255,255,0.9); } -[data-full_day="true"] .calendar_calEventBody { - background-color: white; -} .calendar_calEventBody > p, .calendar_calEventBodySmall > p { white-space: pre-wrap; } diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index 59ddca3584..a2065d0bf4 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -671,11 +671,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget } /* marks a day in the colum-header as holiday */ -.calendar_calHoliday { - background-color: #679fd2; -} .calendar_calHoliday a { - color: #e6e6e6 !important; font-size: 0.9em; } /* marks a day in the column-header additionaly as birthday of some contact, @@ -778,10 +774,15 @@ 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; } .calendar_calEvent:hover { cursor: pointer; } +.calendar_calEvent:not([class*=" cat_"]) { + /* Defaults for no category, so we don't override it */ + background-color: #679fd2; +} /** * All participants accepted the invitation */ @@ -1314,9 +1315,6 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { #calendar_merge { font-size: 11px; } -#calendar-sidebox_date .calendar_calHoliday a { - background-color: #679fd2; -} #uical_select_owner { margin: 9px 0 9px; } diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index 6ab8ee7df8..81dffaef48 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -782,9 +782,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget /* marks a day in the colum-header as holiday */ .calendar_calHoliday{ - background-color: @egw_color_2_e; a { - color: @gray_10 !important; font-size: 0.9em; } } @@ -911,11 +909,15 @@ 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: @egw_color_blue_lightest; } .calendar_calEvent:hover{ cursor: pointer; } - +.calendar_calEvent:not([class*=" cat_"]) { + /* Defaults for no category, so we don't override it */ + background-color: @egw_color_blue_lightest; +} /** * All participants accepted the invitation */ @@ -1349,9 +1351,6 @@ div#calendar-container { #calendar_merge{ font-size: 11px; } -#calendar-sidebox_date .calendar_calHoliday a { - background-color: @egw_color_2_e; -} // Owner #uical_select_owner {margin: 9px 0 9px;}