From 7b2902f0c2d7e143f633cce2af4566b1def30cb5 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 28 Jan 2016 22:08:15 +0000
Subject: [PATCH] Fix (remove) right margin on sidebox calendar

---
 calendar/js/app.js                  | 3 +--
 calendar/templates/default/app.css  | 3 +++
 calendar/templates/pixelegg/app.css | 5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index c83bb5bf95..c1470f72ff 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -3178,8 +3178,7 @@ app.classes.calendar = AppJS.extend(
 							
 			// Dynamic resize of sidebox calendar to fill sidebox
 			var preferred_width = $j('#calendar-sidebox_date .ui-datepicker-inline').outerWidth();
-			var font_ratio = parseFloat($j(this.sidebox_et2.getDOMNode()).css('font-size')) / parseFloat($j('#calendar-sidebox_date .ui-datepicker-inline').css('font-size'));
-
+			var font_ratio = 12 / parseFloat($j('#calendar-sidebox_date .ui-datepicker-inline').css('font-size'));
 			$j(window).on('resize.calendar'+date.dom_id, function() {
 				var percent = 1+(($j(date_widget.getDOMNode()).width() - preferred_width) / preferred_width);
 				percent *= font_ratio;
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index a8bf44c0eb..d56ec68a90 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -16,6 +16,9 @@
 /**
  * Sidebox
  */
+#calendar-et2_target {
+	position: relative;
+}
 #calendar-sidebox_owner {
 	width: 90%;
 }
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 1f7cf0bb30..4d4c1b3eb4 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -11,7 +11,7 @@
  * @package calendar
  * @version $Id$
  */
-/* $Id: app.css 54853 2016-01-26 22:17:51Z nathangray $ */
+/* $Id: app.css 54875 2016-01-28 21:35:22Z nathangray $ */
 /*Media print classes*/
 @media print {
   .th td,
@@ -29,6 +29,9 @@
 /**
  * Sidebox
  */
+#calendar-et2_target {
+  position: relative;
+}
 #calendar-sidebox_owner {
   width: 90%;
 }