From a0b2129479ba10561811847c0651df8b55c8a6ba Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Sun, 8 Nov 2015 15:15:53 +0100 Subject: Support an All-Conference-Closed Screen and mutliple Schedules & Relive-URLs --- assets/css/_closed.less | 1 + assets/js/lustiges-script.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'assets') diff --git a/assets/css/_closed.less b/assets/css/_closed.less index 8aeeb78..ff55b75 100644 --- a/assets/css/_closed.less +++ b/assets/css/_closed.less @@ -1,4 +1,5 @@ body.closed, +body.allclosed, body.not-started { p { margin-top: 50px; diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js index 15f0358..38dc3ae 100644 --- a/assets/js/lustiges-script.js +++ b/assets/js/lustiges-script.js @@ -558,7 +558,7 @@ $(function() { // closed-countdown $(function() { var - $el = $('.closed .countdown'), + $el = $('.countdown'), dt = moment($el.data('dt')); $el.attr('title', 'on '+dt.format('dddd, MMM Do YYYY')) -- cgit v1.2.3 From 0d91cc5f111fac882f1bb375c2bf426195c9cae2 Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Sun, 8 Nov 2015 16:31:29 +0100 Subject: finish overview-page --- assets/css/_allconferences.less | 25 +++++++++++++++++++++++++ assets/css/_structure.less | 1 + 2 files changed, 26 insertions(+) create mode 100644 assets/css/_allconferences.less (limited to 'assets') diff --git a/assets/css/_allconferences.less b/assets/css/_allconferences.less new file mode 100644 index 0000000..d8a14aa --- /dev/null +++ b/assets/css/_allconferences.less @@ -0,0 +1,25 @@ +body.allconferences { + text-align: center; + + .conference { + a { + font-size: @jumbo-font-size; + line-height: @jumbo-line-height; + + @media (max-width: @screen-xs-min) { + font-size: @jumbo-font-size-xs; + } + + display: block; + text-align: center; + + &:hover { + text-decoration: none; + } + } + + p { + margin-top: @line-height-computed; + } + } +} diff --git a/assets/css/_structure.less b/assets/css/_structure.less index 2082e38..d6e4257 100644 --- a/assets/css/_structure.less +++ b/assets/css/_structure.less @@ -88,3 +88,4 @@ body { @import "_closed.less"; @import "_embed.less"; @import "_feedback.less"; +@import "_allconferences.less"; -- cgit v1.2.3 From 25f51731e379d0ca06b66bb3b16bb753a11253f5 Mon Sep 17 00:00:00 2001 From: VOC Date: Fri, 13 Nov 2015 16:36:49 +0100 Subject: fix startpage schedule --- assets/js/lustiges-script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assets') diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js index 38dc3ae..e53194a 100644 --- a/assets/js/lustiges-script.js +++ b/assets/js/lustiges-script.js @@ -350,7 +350,7 @@ $(function() { $.each(talks, function(room, talk) { - if(!talk.known) + if(!talk.room_known) return; if(talk.start < now) -- cgit v1.2.3