diff options
| author | VOC | 2015-11-13 19:48:45 +0100 |
|---|---|---|
| committer | VOC | 2015-11-13 19:48:45 +0100 |
| commit | 92f4fa13749566f6c4378f2c9e80774e8320b825 (patch) | |
| tree | f17c6da85da6edba9c7be10138687518ee534d50 /assets | |
| parent | 32fd126b3fa937389efd1457e9d05daff9f3b347 (diff) | |
| parent | 29af764323dc474c14e05985eeabd3a06ef19c86 (diff) | |
Merge branch 'mandators'
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/css/_allconferences.less | 25 | ||||
| -rw-r--r-- | assets/css/_closed.less | 1 | ||||
| -rw-r--r-- | assets/css/_structure.less | 1 | ||||
| -rw-r--r-- | assets/js/lustiges-script.js | 4 |
4 files changed, 29 insertions, 2 deletions
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/_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/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"; diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js index 15f0358..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) @@ -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')) |