reynir
/
bornhack-website
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Fix events right up to each other. Unstick sidebar on event detail.

This commit is contained in:
Vidir Valberg Gudmundsson 2017-08-16 21:10:27 +02:00
parent bfd115ac5a
commit 99fa18c14d
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
schedule/src/Views/DayView.elm
View File

@ -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 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 -- Set to 0 and then fix it further down in the code
0 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 1
else else
0 0

2
schedule/src/Views/EventDetail.elm
View File

@ -119,8 +119,6 @@ eventDetailSidebar event model =
div div
[ classList [ classList
[ ( "col-sm-3", True ) [ ( "col-sm-3", True )
, ( "schedule-sidebar", True )
, ( "sticky", True )
] ]
] ]
(videoRecordingLink (videoRecordingLink

12
src/program/static/js/elm_based_schedule.js
View File

@ -15299,7 +15299,7 @@ var _user$project$Views_DayView$renderGroup = F2(
A2( A2(
_elm_lang$core$List$map, _elm_lang$core$List$map,
function (instanceB) { 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)) sortedGroup))
}; };
@ -15955,15 +15955,7 @@ var _user$project$Views_EventDetail$eventDetailSidebar = F2(
{ {
ctor: '::', ctor: '::',
_0: {ctor: '_Tuple2', _0: 'col-sm-3', _1: true}, _0: {ctor: '_Tuple2', _0: 'col-sm-3', _1: true},
_1: { _1: {ctor: '[]'}
ctor: '::',
_0: {ctor: '_Tuple2', _0: 'schedule-sidebar', _1: true},
_1: {
ctor: '::',
_0: {ctor: '_Tuple2', _0: 'sticky', _1: true},
_1: {ctor: '[]'}
}
}
}), }),
_1: {ctor: '[]'} _1: {ctor: '[]'}
}, },