From 021f49feec0594fcf4d0f2861eb7547b6bc34560 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Fri, 20 Jul 2018 10:09:58 -0600
Subject: [PATCH] * Calendar - Fix today button positioning - was too far down
 in Firefox

---
 calendar/js/app.js                  |  8 ++++----
 calendar/templates/default/app.css  |  3 +++
 calendar/templates/mobile/app.css   | 14 +++++++++++++-
 calendar/templates/pixelegg/app.css |  7 +++++--
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index ebd504c7d7..fb4288011a 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -3432,12 +3432,12 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
 					if(today.length && go_button.length)
 					{
 						go_button.position({my: 'left+8px center', at: 'right center-1',of: jQuery('#calendar-sidebox_date .ui-datepicker-year')});
-						today.css({
-							'left': (buttons.first().offset().left + buttons.last().offset().left)/2 - Math.ceil(today.outerWidth(true)/2),
-							'top': go_button.css('top')
-						});
 						buttons.position({my: 'center', at: 'center', of: go_button})
 							.css('left', '');
+						today.position({my: 'top', at: 'top', of: buttons});
+						today.css({
+							'left': (buttons.first().offset().left + buttons.last().offset().left)/2 - Math.ceil(today.outerWidth(true)/2),
+						});
 					}
 					if(auto_update)
 					{
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 1e97b1046c..c6a011e2fc 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -67,6 +67,9 @@
 #calendar-et2_target {
 	position: relative;
 }
+#calendar-et2_target > div {
+	position: relative;
+}
 #calendar-sidebox_owner {
 	width: 90%;
 }
diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index 69c77acfff..87f729eeef 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -89,6 +89,9 @@
 #calendar-et2_target {
   position: relative;
 }
+#calendar-et2_target > div {
+  position: relative;
+}
 #calendar-sidebox_owner {
   width: 90%;
 }
@@ -1362,6 +1365,12 @@ Hide subsequent headers in week view with non-consolidated owners
 }
 .calendar_freetime_dow {
   position: absolute;
+  width: 30ex;
+  height: 22em;
+}
+.calendar_freetime_dow ul.ui-multiselect-checkboxes {
+  overflow-y: visible;
+  height: 20em;
 }
 img.calendar_print_button,
 img.calendar_print_appicon {
@@ -1518,6 +1527,8 @@ img.calendar_print_appicon {
 #calendar-list {
   /* Keeps the scrollbar in the window in chrome */
   margin-right: 10px;
+  /* Prevents going to far down  (off bottom)*/
+  height: calc(25%);
 }
 #calendar_sidebox_content .egw_fw_ui_category_content {
   padding-left: 0px !important;
@@ -2135,7 +2146,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.css b/calendar/templates/pixelegg/app.css
index 7742751d72..2de2ca7968 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -77,6 +77,9 @@
 #calendar-et2_target {
   position: relative;
 }
+#calendar-et2_target > div {
+  position: relative;
+}
 #calendar-sidebox_owner {
   width: 90%;
 }
@@ -1354,8 +1357,8 @@ Hide subsequent headers in week view with non-consolidated owners
   height: 22em;
 }
 .calendar_freetime_dow ul.ui-multiselect-checkboxes {
-	overflow-y: visible;
-	height: 20em;
+  overflow-y: visible;
+  height: 20em;
 }
 img.calendar_print_button,
 img.calendar_print_appicon {