From 99fa18c14dbaac28e49795ded851339d6070ce0a Mon Sep 17 00:00:00 2001
From: Vidir Valberg Gudmundsson <valberg@orn.li>
Date: Wed, 16 Aug 2017 21:10:27 +0200
Subject: [PATCH] Fix events right up to each other. Unstick sidebar on event
 detail.

---
 schedule/src/Views/DayView.elm              |  2 +-
 schedule/src/Views/EventDetail.elm          |  2 --
 src/program/static/js/elm_based_schedule.js | 12 ++----------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/schedule/src/Views/DayView.elm b/schedule/src/Views/DayView.elm
index 5721df37..a7ee4b72 100644
--- a/schedule/src/Views/DayView.elm
+++ b/schedule/src/Views/DayView.elm
@@ -151,7 +151,7 @@ renderGroup offset group =
                         else if (Date.Extra.equal instanceB.from instanceA.from) && not (Date.Extra.equal instanceB.to instanceA.to) then
                             -- Set to 0 and then fix it further down in the code
                             0
-                        else if Date.Extra.isBetween instanceB.from instanceB.to instanceA.from then
+                        else if (Date.Extra.isBetween instanceB.from instanceB.to instanceA.from) && not (Date.Extra.equal instanceA.from instanceB.to) then
                             1
                         else
                             0
diff --git a/schedule/src/Views/EventDetail.elm b/schedule/src/Views/EventDetail.elm
index 47e67005..93e35451 100644
--- a/schedule/src/Views/EventDetail.elm
+++ b/schedule/src/Views/EventDetail.elm
@@ -119,8 +119,6 @@ eventDetailSidebar event model =
         div
             [ classList
                 [ ( "col-sm-3", True )
-                , ( "schedule-sidebar", True )
-                , ( "sticky", True )
                 ]
             ]
             (videoRecordingLink
diff --git a/src/program/static/js/elm_based_schedule.js b/src/program/static/js/elm_based_schedule.js
index 8785893a..a5ef4896 100644
--- a/src/program/static/js/elm_based_schedule.js
+++ b/src/program/static/js/elm_based_schedule.js
@@ -15299,7 +15299,7 @@ var _user$project$Views_DayView$renderGroup = F2(
 					A2(
 						_elm_lang$core$List$map,
 						function (instanceB) {
-							return _elm_lang$core$Native_Utils.eq(instanceA, instanceB) ? 0 : ((A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.from, instanceA.from) && A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.to, instanceA.to)) ? 0 : ((A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.from, instanceA.from) && (!A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.to, instanceA.to))) ? 0 : (A3(_justinmimbs$elm_date_extra$Date_Extra$isBetween, instanceB.from, instanceB.to, instanceA.from) ? 1 : 0)));
+							return _elm_lang$core$Native_Utils.eq(instanceA, instanceB) ? 0 : ((A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.from, instanceA.from) && A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.to, instanceA.to)) ? 0 : ((A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.from, instanceA.from) && (!A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceB.to, instanceA.to))) ? 0 : ((A3(_justinmimbs$elm_date_extra$Date_Extra$isBetween, instanceB.from, instanceB.to, instanceA.from) && (!A2(_justinmimbs$elm_date_extra$Date_Extra$equal, instanceA.from, instanceB.to))) ? 1 : 0)));
 						},
 						sortedGroup))
 			};
@@ -15955,15 +15955,7 @@ var _user$project$Views_EventDetail$eventDetailSidebar = F2(
 					{
 						ctor: '::',
 						_0: {ctor: '_Tuple2', _0: 'col-sm-3', _1: true},
-						_1: {
-							ctor: '::',
-							_0: {ctor: '_Tuple2', _0: 'schedule-sidebar', _1: true},
-							_1: {
-								ctor: '::',
-								_0: {ctor: '_Tuple2', _0: 'sticky', _1: true},
-								_1: {ctor: '[]'}
-							}
-						}
+						_1: {ctor: '[]'}
 					}),
 				_1: {ctor: '[]'}
 			},