From 7c74e057010920f8f57a345f08329621ec3a6c32 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 28 Jun 2018 14:20:43 +0100 Subject: [PATCH] Refactor speakerdeck partial --- assets/sass/components/{talk => }/slides.sass | 2 +- assets/sass/site.sass | 2 +- source/_partials/speakerdeck.html.twig | 11 ++++++++++- source/_partials/talk/slides.html.twig | 7 ++++--- 4 files changed, 16 insertions(+), 6 deletions(-) rename assets/sass/components/{talk => }/slides.sass (94%) diff --git a/assets/sass/components/talk/slides.sass b/assets/sass/components/slides.sass similarity index 94% rename from assets/sass/components/talk/slides.sass rename to assets/sass/components/slides.sass index 249939b85..14b50b435 100644 --- a/assets/sass/components/talk/slides.sass +++ b/assets/sass/components/slides.sass @@ -1,4 +1,4 @@ -.talk-slides +.slides background: url('../images/loading.gif') center no-repeat min-height: 275px diff --git a/assets/sass/site.sass b/assets/sass/site.sass index d753e499e..85173aa3e 100644 --- a/assets/sass/site.sass +++ b/assets/sass/site.sass @@ -12,8 +12,8 @@ @import 'components/listing' @import 'components/markdown' @import 'components/note' +@import 'components/slides' @import 'components/table' -@import 'components/talk/slides' @import 'components/talk/video' @import 'components/widget' diff --git a/source/_partials/speakerdeck.html.twig b/source/_partials/speakerdeck.html.twig index 9fd51d7d0..cab3adcbc 100644 --- a/source/_partials/speakerdeck.html.twig +++ b/source/_partials/speakerdeck.html.twig @@ -1 +1,10 @@ - +
+ + +
diff --git a/source/_partials/talk/slides.html.twig b/source/_partials/talk/slides.html.twig index f7161f31f..6f99d4e89 100644 --- a/source/_partials/talk/slides.html.twig +++ b/source/_partials/talk/slides.html.twig @@ -1,8 +1,9 @@ {% if page.speakerdeck.id and page.speakerdeck.ratio %} -
+

Slides

- - + {% include 'speakerdeck' with { + data: page.speakerdeck, + } %}
{% endif %}