summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoak <joak@nospace.at>2020-08-17 19:20:18 +0200
committerjoak <joak@nospace.at>2020-08-17 19:20:18 +0200
commit66d5bb150621e8d8b7b11e997b6a6a9afce8223e (patch)
treed0d806ae0443fd572fef7abca0bcdacb330fff8a
parentf60e9ccd5b046101903a79bf6afa0cf87fdd956c (diff)
update
-rw-r--r--assets/static/style.css8
-rw-r--r--content/works/printing-waves-in-a-moebius-loop/contents.lr11
-rw-r--r--content/works/printing-waves-in-a-moebius-loop/printer.pngbin0 -> 166804 bytes
-rw-r--r--content/works/theremin-typewriter/20200814.pngbin0 -> 3100364 bytes
-rw-r--r--content/works/theremin-typewriter/contents.lr4
-rw-r--r--templates/blocks/picture.html9
-rw-r--r--templates/page.html3
7 files changed, 31 insertions, 4 deletions
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
--- /dev/null
+++ b/content/works/printing-waves-in-a-moebius-loop/printer.png
Binary files differ
diff --git a/content/works/theremin-typewriter/20200814.png b/content/works/theremin-typewriter/20200814.png
new file mode 100644
index 0000000..55f00ac
--- /dev/null
+++ b/content/works/theremin-typewriter/20200814.png
Binary files 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) %}
-<img id="{{ this.url|replace('.','') }}" class="bigimage" src="{{img.thumbnail(800)|url}}" alt="{{ this.caption }}">
+<div class="galleryImage">
+ {% set img = record.attachments.images.get(this.url) %}
+ <img id="{{ this.url|replace('.','') }}" class="bigimage" src="{{img.thumbnail(800)|url}}" alt="{{ this.caption }}">
+ {% if this.caption %}
+ <div class="caption">{{this.caption}}</div>
+ {% endif %}
+</div>
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}}
<span class="previews">
+<!--
<h1 class="starth1">{{work.title}}</h1>
-
+-->
{% for item in work.content.blocks %}
{% if item._flowblock == 'gallery' %}
{% for i in item.gallery.blocks %}