From efe9478d848b78c430221a69e25742d5f2626898 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Fri, 30 Jun 2017 09:47:00 -0600
Subject: [PATCH] * Calendar - Week view with multiple users now keeps date
 heading at the top

---
 calendar/templates/default/app.css   | 13 +++++++++++--
 calendar/templates/pixelegg/app.css  | 16 +++++++++++++---
 calendar/templates/pixelegg/app.less |  3 ++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index b8e5c9b986..70cb176999 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -238,7 +238,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 
 /* marks a day in the colum-header as today
  */
-.calendar_calToday{
+.calendar_calToday,
+.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calToday.et2_link.et2_clickable {
 	background: #ffffcc;
 }
 .calendar_calWeek{
@@ -256,7 +257,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 
 /* marks a day in the colum-header as holiday
  */
-.calendar_calHoliday{
+.calendar_calHoliday,
+.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calHoliday.et2_link.et2_clickable {
 	background-color: rgba(103, 159, 210, 0.5);
 }
 /* marks a day in the column-header additionaly as birthday of some contact,
@@ -452,6 +454,7 @@ Hide subsequent headers in week view with non-consolidated owners
 	border-bottom: 1px solid silver;
 	white-space: nowrap;
 	overflow: hidden;
+	background-color: white;
 }
 
 /* Seperate long and short day names */
@@ -463,6 +466,12 @@ Hide subsequent headers in week view with non-consolidated owners
 	display: none;
 }
 
+/* Keep header dates when showing one week, multiple users */
+.calendar_calTimeGridFixed:not(.calendar_TimeGridNoLabel) .calendar_calDayColHeader > div.et2_clickable.et2_link {
+	position: fixed;
+    width: inherit;
+    margin-top: -1px;
+}
 /* Indicators for offscreen events */
 .calendar_calDayColHeader .hiddenEventBefore, .calendar_calDayCol .hiddenEventAfter {
 	width: 80%;
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index cac9c367f6..d6d3387e8c 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -244,7 +244,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 }
 /* marks a day in the colum-header as today
  */
-.calendar_calToday {
+.calendar_calToday,
+.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calToday.et2_link.et2_clickable {
   background: #ffffcc;
 }
 .calendar_calWeek {
@@ -261,7 +262,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 }
 /* marks a day in the colum-header as holiday
  */
-.calendar_calHoliday {
+.calendar_calHoliday,
+.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calHoliday.et2_link.et2_clickable {
   background-color: rgba(103, 159, 210, 0.5);
 }
 /* marks a day in the column-header additionaly as birthday of some contact,
@@ -452,6 +454,7 @@ Hide subsequent headers in week view with non-consolidated owners
   border-bottom: 1px solid silver;
   white-space: nowrap;
   overflow: hidden;
+  background-color: white;
 }
 /* Seperate long and short day names */
 .calendar_calDayColHeader > div[data-date] .short_date,
@@ -461,6 +464,12 @@ Hide subsequent headers in week view with non-consolidated owners
 .calendar_calDayColHeader > div[data-date] .short_date {
   display: none;
 }
+/* Keep header dates when showing one week, multiple users */
+.calendar_calTimeGridFixed:not(.calendar_TimeGridNoLabel) .calendar_calDayColHeader > div.et2_clickable.et2_link {
+  position: fixed;
+  width: inherit;
+  margin-top: -1px;
+}
 /* Indicators for offscreen events */
 .calendar_calDayColHeader .hiddenEventBefore,
 .calendar_calDayCol .hiddenEventAfter {
@@ -1987,7 +1996,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 }
 /* marks a day in the colum-header as today
 */
-.calendar_calToday {
+.calendar_calToday,
+.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calToday.et2_link.et2_clickable {
   background-color: #ffc200;
 }
 .calendar_calWeek {
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 92d96cbf47..ebb4711f2d 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -619,7 +619,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 
 /* marks a day in the colum-header as today
 */
-.calendar_calToday{
+.calendar_calToday,
+.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calToday.et2_link.et2_clickable {
     //	background: #ffffcc;
     .background_table_cal_head;
 }