From ad8d6d53890823b20d3b502cd7c316ff72d9d620 Mon Sep 17 00:00:00 2001 From: Benjamin Jones Date: Sat, 5 Sep 2020 16:12:50 +0200 Subject: [PATCH] added first '/watch' layout. --- .htaccess | 1 + _config.yml | 2 ++ _data/menu.yml | 14 +++++----- _data/watch-menu.yml | 14 ++++++++++ _includes/common/banner.html | 4 ++- _includes/common/clock.html | 19 +++++++++++++ _includes/common/donate-button.html | 3 +++ _includes/common/header-collapsed.html | 19 +++++++++++++ _includes/common/header.html | 37 +++++++++++++++----------- _includes/common/logo.html | 6 ++++- _includes/common/navigation.html | 10 ++++++- _includes/common/watch-panel.html | 4 +++ _includes/embeds/discord-chat.html | 3 +++ _includes/embeds/twitch.html | 12 +++++++++ _layouts/default.html | 4 +-- _layouts/page.html | 5 ++-- _layouts/watch.html | 21 +++++++++++++++ _sass/includes/clock.scss | 13 +++++++++ _sass/includes/header.scss | 8 ++++++ _sass/includes/watch-panel.scss | 29 ++++++++++++++++++++ _sass/layout.scss | 4 +++ _sass/pages/donate.scss | 18 +++++++++++++ _sass/pages/watch.scss | 21 +++++++++++++++ assets/css/index.scss | 4 +++ donate/index.md | 19 +++++++++++++ fr/donate/index.md | 19 +++++++++++++ package.json | 2 +- watch/index.html | 8 ++++++ 28 files changed, 292 insertions(+), 31 deletions(-) create mode 100644 .htaccess create mode 100644 _data/watch-menu.yml create mode 100644 _includes/common/clock.html create mode 100644 _includes/common/donate-button.html create mode 100644 _includes/common/header-collapsed.html create mode 100644 _includes/common/watch-panel.html create mode 100644 _includes/embeds/discord-chat.html create mode 100644 _includes/embeds/twitch.html create mode 100644 _layouts/watch.html create mode 100644 _sass/includes/clock.scss create mode 100644 _sass/includes/watch-panel.scss create mode 100644 _sass/pages/donate.scss create mode 100644 _sass/pages/watch.scss create mode 100644 donate/index.md create mode 100644 fr/donate/index.md create mode 100644 watch/index.html diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..de377bf --- /dev/null +++ b/.htaccess @@ -0,0 +1 @@ +ErrorDocument 404 /404.html diff --git a/_config.yml b/_config.yml index ad91f6d..9aa14c2 100644 --- a/_config.yml +++ b/_config.yml @@ -26,6 +26,8 @@ description: >- # this means to ignore newlines until "baseurl:" baseurl: "" # the subpath of your site, e.g. /blog url: "" # the base hostname & protocol for your site, e.g. http://example.com permalink: /:categories/news/:year/:title:output_ext +discordID: 737678270924849183 +twitchChannel: bnjmnjns # Build settings diff --git a/_data/menu.yml b/_data/menu.yml index 4a23706..5878d9f 100644 --- a/_data/menu.yml +++ b/_data/menu.yml @@ -27,10 +27,10 @@ fr: name: intervenants url: /rf2020/participants -# - donate: -# en: -# name: donate -# url: "/donate" -# fr: -# name: faire un don -# url: /donate +- donate: + en: + name: donate + url: "/donate" + fr: + name: faire un don + url: /donate diff --git a/_data/watch-menu.yml b/_data/watch-menu.yml new file mode 100644 index 0000000..40383da --- /dev/null +++ b/_data/watch-menu.yml @@ -0,0 +1,14 @@ +- program: + en: + name: program + url: "#program" + fr: + name: programme + url: "#program" +- donate: + en: + name: donate + url: "/donate" + fr: + name: faire un don + url: "/donate" diff --git a/_includes/common/banner.html b/_includes/common/banner.html index ea6d189..a3e2d3d 100644 --- a/_includes/common/banner.html +++ b/_includes/common/banner.html @@ -29,7 +29,9 @@ function cdText() { const cd = countdown(new Date(), new Date("Wed Sep 18 2020 10:30:00 GMT+0200 (Central European Summer Time)"), 0, 3).toString(); - cdTime.innerHTML = cd; + if(cdTime.innerHTML !== cd) { + cdTime.innerHTML = cd; + } if (!bannerVisible) { banner.classList.remove('hidden') diff --git a/_includes/common/clock.html b/_includes/common/clock.html new file mode 100644 index 0000000..0a2314c --- /dev/null +++ b/_includes/common/clock.html @@ -0,0 +1,19 @@ +

+ + + \ No newline at end of file diff --git a/_includes/common/donate-button.html b/_includes/common/donate-button.html new file mode 100644 index 0000000..5c432f2 --- /dev/null +++ b/_includes/common/donate-button.html @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/_includes/common/header-collapsed.html b/_includes/common/header-collapsed.html new file mode 100644 index 0000000..87ee269 --- /dev/null +++ b/_includes/common/header-collapsed.html @@ -0,0 +1,19 @@ +
+ {% include common/navigation.html menu=site.data.watch-menu %} + + + {% if page.parentEn %} + {% include common/back-button.html parent=page.parentEn parentName=page.parentNameEn %} + {% elsif page.parentFr %} + {% include common/back-button.html parent=page.parentFr parentName=page.parentNameFr %} + {% endif %} + + +
+ {% if page.lang == 'fr' %} + {% include common/logo.html size = 'small' %} + {% else %} + {% include common/logo.html size = 'small' %} + {% endif %} +
+
\ No newline at end of file diff --git a/_includes/common/header.html b/_includes/common/header.html index b290957..c12a300 100644 --- a/_includes/common/header.html +++ b/_includes/common/header.html @@ -1,19 +1,24 @@ -
- {% include common/navigation.html %} +{% if include.collapsed == true %} + {% include common/header-collapsed.html %} +{% else %} +
+ {% include common/navigation.html %} - {% if page.parentEn %} - {% include common/back-button.html parent=page.parentEn parentName=page.parentNameEn %} - {% elsif page.parentFr %} - {% include common/back-button.html parent=page.parentFr parentName=page.parentNameFr %} - {% endif %} - + {% if page.parentEn %} + {% include common/back-button.html parent=page.parentEn parentName=page.parentNameEn %} + {% elsif page.parentFr %} + {% include common/back-button.html parent=page.parentFr parentName=page.parentNameFr %} + {% endif %} -
- {% if page.lang == 'fr' %} - {% include common/logo.html %} - {% else %} - {% include common/logo.html %} - {% endif %} -
-
\ No newline at end of file + + +
+ {% if page.lang == 'fr' %} + {% include common/logo.html %} + {% else %} + {% include common/logo.html %} + {% endif %} +
+
+{% endif %} \ No newline at end of file diff --git a/_includes/common/logo.html b/_includes/common/logo.html index 47abd8e..a299c31 100644 --- a/_includes/common/logo.html +++ b/_includes/common/logo.html @@ -1 +1,5 @@ -

Reclaim
Futures

\ No newline at end of file +{% if include.size == 'small' %} +

Reclaim Futures 2020

+{% else %} +

Reclaim
Futures

+{% endif %} \ No newline at end of file diff --git a/_includes/common/navigation.html b/_includes/common/navigation.html index e813476..45a865a 100644 --- a/_includes/common/navigation.html +++ b/_includes/common/navigation.html @@ -1,6 +1,14 @@ +{% if include.menu %} + {% assign menu = include.menu %} +{% else %} + {% assign menu = site.data.menu %} +{% endif %} + +