diff options
Diffstat (limited to 'assets')
-rw-r--r-- | assets/css/_room.less | 4 | ||||
-rw-r--r-- | assets/css/_schedule.less | 2 | ||||
-rw-r--r-- | assets/css/_structure.less | 1 | ||||
-rw-r--r-- | assets/js/lustiges-script.js | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/assets/css/_room.less b/assets/css/_room.less index cd6d4c9..161000d 100644 --- a/assets/css/_room.less +++ b/assets/css/_room.less @@ -79,9 +79,5 @@ body.room { display: none; } } - - #schedule { - @import "_schedule.less"; - } } } diff --git a/assets/css/_schedule.less b/assets/css/_schedule.less index 1cd70ce..555428f 100644 --- a/assets/css/_schedule.less +++ b/assets/css/_schedule.less @@ -1,4 +1,4 @@ -.schedule { +body .schedule { &.scroll-container { overflow: hidden; overflow-x: scroll; diff --git a/assets/css/_structure.less b/assets/css/_structure.less index b85f2b1..fc3cced 100644 --- a/assets/css/_structure.less +++ b/assets/css/_structure.less @@ -110,6 +110,7 @@ body { @import "_error.less"; @import "_overview.less"; @import "_room.less"; +@import "_schedule.less"; @import "_relive.less"; @import "_multiview.less"; @import "_closed.less"; diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js index adb785a..62c94be 100644 --- a/assets/js/lustiges-script.js +++ b/assets/js/lustiges-script.js @@ -51,7 +51,7 @@ $(function() { // schedule-timeline $(function() { var - $schedule = $('.schedule'), + $schedule = $('body .schedule'), $now = $schedule.find('.now'), scrollLock = false, rewindTimeout, @@ -156,7 +156,7 @@ $(function() { clearInterval(updateInterval); } - if(window.location.hash == '#schedule') + if(window.location.hash == '#schedule' || window.location.href.indexOf('/schedule') != -1) on(); // trigger when a tab was changed |