From 66d5bb150621e8d8b7b11e997b6a6a9afce8223e Mon Sep 17 00:00:00 2001 From: joak Date: Mon, 17 Aug 2020 19:20:18 +0200 Subject: update --- assets/static/style.css | 8 ++++++++ .../printing-waves-in-a-moebius-loop/contents.lr | 11 ++++++++++- .../printing-waves-in-a-moebius-loop/printer.png | Bin 0 -> 166804 bytes content/works/theremin-typewriter/20200814.png | Bin 0 -> 3100364 bytes content/works/theremin-typewriter/contents.lr | 4 ++++ templates/blocks/picture.html | 9 +++++++-- templates/page.html | 3 ++- 7 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 content/works/printing-waves-in-a-moebius-loop/printer.png create mode 100644 content/works/theremin-typewriter/20200814.png diff --git a/assets/static/style.css b/assets/static/style.css index b108b4a..e824e70 100644 --- a/assets/static/style.css +++ b/assets/static/style.css @@ -274,6 +274,14 @@ div.previews{ max-width: 800px; max-height: calc(100vH - 2em); } + +.galleryImage{ + margin-top: 1vH; + margin-bottom: 1vH; +} +.caption{ + margin-bottom: 1vH; +} /*gallery end*/ /*responsive start*/ diff --git a/content/works/printing-waves-in-a-moebius-loop/contents.lr b/content/works/printing-waves-in-a-moebius-loop/contents.lr index b79aa5c..c92b2fc 100644 --- a/content/works/printing-waves-in-a-moebius-loop/contents.lr +++ b/content/works/printing-waves-in-a-moebius-loop/contents.lr @@ -2,6 +2,15 @@ title: printing sine waves in a Moebius loop --- content: +#### gallery #### +title: +---- +gallery: + +##### picture ##### +url: printer.png +----- +caption: #### content #### content: @@ -40,4 +49,4 @@ year_end: 2020-07-20 --- year_start: 2020-07-07 --- -thumbnail: printer.jpg +thumbnail: printer.png diff --git a/content/works/printing-waves-in-a-moebius-loop/printer.png b/content/works/printing-waves-in-a-moebius-loop/printer.png new file mode 100644 index 0000000..2070f5e Binary files /dev/null and b/content/works/printing-waves-in-a-moebius-loop/printer.png differ diff --git a/content/works/theremin-typewriter/20200814.png b/content/works/theremin-typewriter/20200814.png new file mode 100644 index 0000000..55f00ac Binary files /dev/null and b/content/works/theremin-typewriter/20200814.png differ diff --git a/content/works/theremin-typewriter/contents.lr b/content/works/theremin-typewriter/contents.lr index 802e97a..f27bd65 100644 --- a/content/works/theremin-typewriter/contents.lr +++ b/content/works/theremin-typewriter/contents.lr @@ -21,6 +21,10 @@ gallery: url: termemin-typewriter.jpg ----- caption: +##### picture ##### +url: 20200814.png +----- +caption: 2020/08/14 exercise results #### video #### url: theremin-typewriter-small.mp4 ---- diff --git a/templates/blocks/picture.html b/templates/blocks/picture.html index a75eb3e..8008f92 100644 --- a/templates/blocks/picture.html +++ b/templates/blocks/picture.html @@ -1,2 +1,7 @@ -{% set img = record.attachments.images.get(this.url) %} -{{ this.caption }} +
+ {% set img = record.attachments.images.get(this.url) %} + {{ this.caption }} + {% if this.caption %} +
{{this.caption}}
+ {% endif %} +
diff --git a/templates/page.html b/templates/page.html index 5d9297d..f5fa458 100644 --- a/templates/page.html +++ b/templates/page.html @@ -10,8 +10,9 @@ {% if work.selected %} {{work.content.blocks._flowblock}} + {% for item in work.content.blocks %} {% if item._flowblock == 'gallery' %} {% for i in item.gallery.blocks %} -- cgit v1.2.3