From e113e2259c25514d5fb80021f1eed7bb2dd97ed0 Mon Sep 17 00:00:00 2001 From: joak Date: Wed, 26 Aug 2020 20:07:32 +0200 Subject: updates --- assets/static/fonts/EBGaramond-Regular.ttf | Bin 0 -> 599076 bytes assets/static/fonts/Inter-Regular.ttf | Bin 0 -> 287928 bytes assets/static/fonts/lg.eot | Bin 4024 -> 0 bytes assets/static/fonts/lg.svg | 47 --------------------- assets/static/fonts/lg.ttf | Bin 3880 -> 0 bytes assets/static/fonts/lg.woff | Bin 3956 -> 0 bytes assets/static/style.css | 12 +++++- content/works/theremin-typewriter/contents.lr | 4 ++ content/works/theremin-typewriter/outline-1.png | Bin 0 -> 1016446 bytes templates/curating.html | 51 +++++++++++++++-------- templates/exhibition.html | 52 ++++++++++++++++-------- templates/lecture.html | 47 ++++++++++++++------- templates/performance.html | 52 ++++++++++++++++-------- 13 files changed, 154 insertions(+), 111 deletions(-) create mode 100644 assets/static/fonts/EBGaramond-Regular.ttf create mode 100644 assets/static/fonts/Inter-Regular.ttf delete mode 100644 assets/static/fonts/lg.eot delete mode 100644 assets/static/fonts/lg.svg delete mode 100644 assets/static/fonts/lg.ttf delete mode 100644 assets/static/fonts/lg.woff create mode 100644 content/works/theremin-typewriter/outline-1.png diff --git a/assets/static/fonts/EBGaramond-Regular.ttf b/assets/static/fonts/EBGaramond-Regular.ttf new file mode 100644 index 0000000..f57146c Binary files /dev/null and b/assets/static/fonts/EBGaramond-Regular.ttf differ diff --git a/assets/static/fonts/Inter-Regular.ttf b/assets/static/fonts/Inter-Regular.ttf new file mode 100644 index 0000000..96fd6a1 Binary files /dev/null and b/assets/static/fonts/Inter-Regular.ttf differ diff --git a/assets/static/fonts/lg.eot b/assets/static/fonts/lg.eot deleted file mode 100644 index 51264c4..0000000 Binary files a/assets/static/fonts/lg.eot and /dev/null differ diff --git a/assets/static/fonts/lg.svg b/assets/static/fonts/lg.svg deleted file mode 100644 index 22b1a1f..0000000 --- a/assets/static/fonts/lg.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - -{ - "fontFamily": "lg", - "majorVersion": 1, - "minorVersion": 0, - "fontURL": "https://github.com/sachinchoolur/lightGallery", - "copyright": "sachin", - "license": "MLT", - "licenseURL": "http://opensource.org/licenses/MIT", - "version": "Version 1.0", - "fontId": "lg", - "psName": "lg", - "subFamily": "Regular", - "fullName": "lg", - "description": "Font generated by IcoMoon." -} - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/assets/static/fonts/lg.ttf b/assets/static/fonts/lg.ttf deleted file mode 100644 index 8ad8199..0000000 Binary files a/assets/static/fonts/lg.ttf and /dev/null differ diff --git a/assets/static/fonts/lg.woff b/assets/static/fonts/lg.woff deleted file mode 100644 index d98ff60..0000000 Binary files a/assets/static/fonts/lg.woff and /dev/null differ diff --git a/assets/static/style.css b/assets/static/style.css index e824e70..8f6183c 100644 --- a/assets/static/style.css +++ b/assets/static/style.css @@ -1,3 +1,13 @@ +@font-face { + font-family: "inter"; + src: url("/static/fonts/Inter-Regular.ttf"); +} + +@font-face { + font-family: "garamond"; + src: url("/static/fonts/EBGaramond-Regular.ttf"); +} + body{ margin: 0; @@ -99,7 +109,7 @@ ul.menu{ margin: 0; padding: 0; font-size: 150%; - font-family: serif; + font-family: garamond; } ul.menu li { diff --git a/content/works/theremin-typewriter/contents.lr b/content/works/theremin-typewriter/contents.lr index 901b572..cee2e79 100644 --- a/content/works/theremin-typewriter/contents.lr +++ b/content/works/theremin-typewriter/contents.lr @@ -22,6 +22,10 @@ url: termemin-typewriter.jpg ----- caption: ##### picture ##### +url: outline-1.png +----- +caption: +##### picture ##### url: theremin-typewriter2.jpg ----- caption: diff --git a/content/works/theremin-typewriter/outline-1.png b/content/works/theremin-typewriter/outline-1.png new file mode 100644 index 0000000..8382e6e Binary files /dev/null and b/content/works/theremin-typewriter/outline-1.png differ diff --git a/templates/curating.html b/templates/curating.html index bdd6536..bad1b66 100644 --- a/templates/curating.html +++ b/templates/curating.html @@ -1,21 +1,40 @@ {% extends "layout.html" %} {% block title %}{{ this.title }}{% endblock %} {% block body %} -
-
-
-

{{ bag('translation', this.alt, 'curating') }}

- -

{{ bag('translation', this.alt, 'title') }}: {{ this.title }}

-

Start: {{ this.date_start|dateformat('Y-MM-dd') }}

-

{{ bag('translation', this.alt, 'end') }}: {{ this.date_end|dateformat('Y-MM-dd') }}

-

{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }}

-

{{ bag('translation', this.alt, 'place') }}: {{ this.place }}

-

{{ bag('translation', this.alt, 'country') }}: {{ this.country }}

-

{{ bag('translation', this.alt, 'website') }}: {{this.url}}

-

{{ bag('translation', this.alt, 'comment') }}: {{ this.comment }}

- {{ this.info }} -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + {% if this.tfwebsite == True %} + + {% endif %} + {% if this.comment == true %} + + {% endif %} +

{{ bag('translation', this.alt, 'curating') }}

{{ bag('translation', this.alt, 'title') }}: {{ this.title }}
Start: {{ this.date_start|dateformat('Y-MM-dd') }}
{{ bag('translation', this.alt, 'end') }}: {{ this.date_end|dateformat('Y-MM-dd') }}
{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }}
{{ bag('translation', this.alt, 'place') }}: {{ this.place }}
{{ bag('translation', this.alt, 'country') }}: {{ this.country }}
{{bag('translation', this.alt, 'website')}}: {{this.website}}
{{ this.comment }}
+
+
+
+ {{ this.info }}
+
{% endblock %} diff --git a/templates/exhibition.html b/templates/exhibition.html index bec0642..3bd9067 100644 --- a/templates/exhibition.html +++ b/templates/exhibition.html @@ -1,21 +1,41 @@ {% extends "layout.html" %} {% block title %}{{ this.title }}{% endblock %} {% block body %} -
-
-
-

{{ bag('translation', this.alt, 'exhibition') }}

- -

{{ bag('translation', this.alt, 'title') }}: {{ this.title }}

-

Start: {{ this.date_start|dateformat('Y-MM-dd') }}

-

{{ bag('translation', this.alt, 'end') }}: {{ this.date_end|dateformat('Y-MM-dd') }}

-

{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }}

-

{{ bag('translation', this.alt, 'place') }}: {{ this.place }}

-

{{ bag('translation', this.alt, 'country') }}: {{ this.country }}

-

{{ bag('translation', this.alt, 'website') }}: {{this.url}}

-

{{ bag('translation', this.alt, 'comment') }}: {{ this.comment }}

- {{ this.info }} -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + {% if this.tfwebsite == True %} + + {% endif %} + {% if this.comment == true %} + + {% endif %} +

{{ bag('translation', this.alt, 'exhibition') }}

{{ bag('translation', this.alt, 'title') }}: {{ this.title }}
Start: {{ this.date_start|dateformat('Y-MM-dd') }}
{{ bag('translation', this.alt, 'end') }}: {{ this.date_end|dateformat('Y-MM-dd') }}
{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }}
{{ bag('translation', this.alt, 'place') }}: {{ this.place }}
{{ bag('translation', this.alt, 'country') }}: {{ this.country }}
{{bag('translation', this.alt, 'website')}}: {{this.website}}
{{ this.comment }}
+
+
+
+ {{ this.info }}
+
+ {% endblock %} diff --git a/templates/lecture.html b/templates/lecture.html index 284040e..74fbc69 100644 --- a/templates/lecture.html +++ b/templates/lecture.html @@ -1,20 +1,37 @@ {% extends "layout.html" %} {% block title %}{{ this.title }}{% endblock %} {% block body %} -
-
-
-

{{ bag('translation', this.alt, 'lecture') }}

- -

{{ bag('translation', this.alt, 'title') }}: {{ this.title }}

-

{{ bag('translation', this.alt, 'date') }}: {{ this.date }}

-

{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }}

-

{{ bag('translation', this.alt, 'place') }}: {{ this.place }}

-

{{ bag('translation', this.alt, 'country') }}: {{ this.country }}

-

{{ bag('translation', this.alt, 'website') }}: {{this.url}}

-

{{ bag('translation', this.alt, 'comment') }}: {{ this.comment }}

- {{ this.info }} -
-
+
+ + + + + + + + + + + + + + + + + + + + {% if this.tfwebsite == True %} + + {% endif %} + {% if this.comment == true %} + + {% endif %} +

{{ bag('translation', this.alt, 'lecture') }}

{{ bag('translation', this.alt, 'title') }}: {{ this.title }}
{{ bag('translation', this.alt, 'date') }}: {{ this.date|dateformat('Y-MM-dd') }}
{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }}
{{ bag('translation', this.alt, 'place') }}: {{ this.place }}
{{ bag('translation', this.alt, 'country') }}: {{ this.country }}
{{bag('translation', this.alt, 'website')}}: {{this.website}}
{{ this.comment }}
+
+
+
+ {{ this.info }}
+
{% endblock %} diff --git a/templates/performance.html b/templates/performance.html index 9a6ff23..6dff70e 100644 --- a/templates/performance.html +++ b/templates/performance.html @@ -1,21 +1,41 @@ {% extends "layout.html" %} {% block title %}{{ this.title }}{% endblock %} {% block body %} -
-
-
-

{{ bag('translation', this.alt, 'performance') }}

- -

{{ bag('translation', this.alt, 'title') }}: {{ this.title }}

-

Start: {{ this.date_start|dateformat('Y-MM-dd') }}

-

{{ bag('translation', this.alt, 'end') }}: {{ this.date_end|dateformat('Y-MM-dd') }}

-

{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }}

-

{{ bag('translation', this.alt, 'place') }}: {{ this.place }}

-

{{ bag('translation', this.alt, 'country') }}: {{ this.country }}

-

{{ bag('translation', this.alt, 'website') }}: {{this.url}}

-

{{ bag('translation', this.alt, 'comment') }}: {{ this.comment }}

- {{ this.info }} -
-
+ +
+ + + + + + + + + + + + + + + + + + + + + + + {% if this.tfwebsite == True %} + + {% endif %} + {% if this.comment == true %} + + {% endif %} +

{{ bag('translation', this.alt, 'performance') }}

{{ bag('translation', this.alt, 'title') }}: {{ this.title }}
Start: {{ this.date_start|dateformat('Y-MM-dd') }}
{{ bag('translation', this.alt, 'end') }}: {{ this.date_end|dateformat('Y-MM-dd') }}
{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }}
{{ bag('translation', this.alt, 'place') }}: {{ this.place }}
{{ bag('translation', this.alt, 'country') }}: {{ this.country }}
{{bag('translation', this.alt, 'website')}}: {{this.website}}
{{ this.comment }}
+
+
+
+ {{ this.info }}
+
{% endblock %} -- cgit v1.2.3