From a86a55ffb038c8daad259053a7d06eef3ff23675 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Fri, 3 Nov 2017 13:49:21 +0100 Subject: [PATCH] details --- content/en/hbsc-cal-1.md | 3 +-- content/en/opening.md | 2 +- content/en/sounduncloud.md | 2 +- content/en/the-secret-life-en-1.md | 2 +- content/en/the-secret-life-en-2.md | 2 +- content/en/the-secret-life-en-3.md | 2 +- content/hbsc-cal-1.md | 3 +-- content/opening.md | 2 +- content/sounduncloud.md | 2 +- content/the-secret-life-seizoen-1.md | 2 +- content/the-secret-life-seizoen-2.md | 2 +- content/the-secret-life-seizoen-3.md | 2 +- themes/cetcat/static/css/main.css | 22 ++++++++++------------ themes/cetcat/templates/article.html | 16 +++++----------- themes/cetcat/templates/index.html | 16 +++++----------- 15 files changed, 32 insertions(+), 48 deletions(-) diff --git a/content/en/hbsc-cal-1.md b/content/en/hbsc-cal-1.md index 5b4fc487d..0e08907ed 100644 --- a/content/en/hbsc-cal-1.md +++ b/content/en/hbsc-cal-1.md @@ -3,8 +3,7 @@ Date: 2017-11-16 Category: gathering Slug: hbsc-cal-en-1 lang: en -start: 16 November, 19:00 -status: draft +start: Thursday 16 November, 19:00 ![map preview](/images/cal.png) diff --git a/content/en/opening.md b/content/en/opening.md index 095b03821..5aefd34d0 100644 --- a/content/en/opening.md +++ b/content/en/opening.md @@ -5,7 +5,7 @@ Slug: opening-space lang: en event-start:2017-11-03 20:00 event-duration:4h -start: 3 November, 20:00 +start: Friday 3 November, 20:00 ![map preview](/images/de_varia.png) diff --git a/content/en/sounduncloud.md b/content/en/sounduncloud.md index 92f04975c..fccd2d08f 100644 --- a/content/en/sounduncloud.md +++ b/content/en/sounduncloud.md @@ -4,7 +4,7 @@ Category: curriculum Slug: sounduncloud lang: en curriculum: True -start: 1 December +start: Friday 1 December ![Offline listening for days!](/images/offline_listening.png) diff --git a/content/en/the-secret-life-en-1.md b/content/en/the-secret-life-en-1.md index 03ec8a5a4..6ccc3d251 100644 --- a/content/en/the-secret-life-en-1.md +++ b/content/en/the-secret-life-en-1.md @@ -3,7 +3,7 @@ Date: 2017-11-05 Category: screening Slug: the-secret-life-screening-1 lang: en -start: 5 November, 19:30 +start: Sunday 5 November, 19:30 ![folding chains](/images/secret_life_chain.gif) diff --git a/content/en/the-secret-life-en-2.md b/content/en/the-secret-life-en-2.md index 2de84bd8f..7bd983618 100644 --- a/content/en/the-secret-life-en-2.md +++ b/content/en/the-secret-life-en-2.md @@ -3,7 +3,7 @@ Date: 2017-11-19 Category: screening Slug: the-secret-life-screening-2 lang: en -start: 19 November, 16:30 +start: Sunday 19 November, 16:30 ![folding chains](/images/fire.gif) diff --git a/content/en/the-secret-life-en-3.md b/content/en/the-secret-life-en-3.md index b3a6c701b..b6db4bf14 100644 --- a/content/en/the-secret-life-en-3.md +++ b/content/en/the-secret-life-en-3.md @@ -3,7 +3,7 @@ Date: 2017-11-19 Category: screening Slug: the-secret-life-screening-3 lang: en -start: ???, 19:30 +start: Sunday ???, 19:30 status: draft ![folding chains](/images/secret_life_chain.gif) diff --git a/content/hbsc-cal-1.md b/content/hbsc-cal-1.md index aab7d3c62..980fad707 100644 --- a/content/hbsc-cal-1.md +++ b/content/hbsc-cal-1.md @@ -3,8 +3,7 @@ Date: 2017-11-16 Category: gathering Slug: hbsc-cal-1 lang: nl -start: 16 November, 19:00 -status: draft +start: donderdag 16 november, 19:00 ![map preview](/images/cal.png) diff --git a/content/opening.md b/content/opening.md index b6e4ed404..8a21c50cd 100644 --- a/content/opening.md +++ b/content/opening.md @@ -3,7 +3,7 @@ Date: 2017-11-03 Category: event Slug: opening-ruimte lang: nl -start: 3 November, 20:00 +start: vrijdag 3 november, 20:00 event-start:2017-11-03 20:00 event-duration:4h diff --git a/content/sounduncloud.md b/content/sounduncloud.md index 9c220670c..68a8473be 100644 --- a/content/sounduncloud.md +++ b/content/sounduncloud.md @@ -3,7 +3,7 @@ Date: 2017-12-01 Category: curriculum Slug: sounduncloud lang: nl -start: 1 December +start: vrijdag 1 december ![Offline listening for days!](/images/offline_listening.png) diff --git a/content/the-secret-life-seizoen-1.md b/content/the-secret-life-seizoen-1.md index 9991f22df..a5ef1a0f0 100644 --- a/content/the-secret-life-seizoen-1.md +++ b/content/the-secret-life-seizoen-1.md @@ -3,7 +3,7 @@ Date: 2017-11-05 Category: event Slug: the-secret-life-1 lang: nl -start: 5 November, 19:30 +start: zondag 5 november, 19:30 ![folding chains](/images/secret_life_chain.gif) diff --git a/content/the-secret-life-seizoen-2.md b/content/the-secret-life-seizoen-2.md index adb55999e..42455cf32 100644 --- a/content/the-secret-life-seizoen-2.md +++ b/content/the-secret-life-seizoen-2.md @@ -3,7 +3,7 @@ Date: 2017-11-19 Category: event Slug: the-secret-life-2 lang: nl -start: 19 November, 16:30 +start: zondag 19 november, 16:30 ![folding chains](/images/fire.gif) diff --git a/content/the-secret-life-seizoen-3.md b/content/the-secret-life-seizoen-3.md index c4ba1bd12..9d735e40a 100644 --- a/content/the-secret-life-seizoen-3.md +++ b/content/the-secret-life-seizoen-3.md @@ -3,7 +3,7 @@ Date: 2017-11-01 Category: event Slug: the-secret-life-3 lang: nl -start: 19 November, 16:30 +start: zondag 19 november, 16:30 status: draft ![folding chains](/images/secret_life_chain.gif) diff --git a/themes/cetcat/static/css/main.css b/themes/cetcat/static/css/main.css index 382f2a20d..42be80495 100644 --- a/themes/cetcat/static/css/main.css +++ b/themes/cetcat/static/css/main.css @@ -70,15 +70,6 @@ header { line-height: 1.7; letter-spacing: 0; } -/*header { - width:calc(100% - 50px); - margin-top:15px; - padding-bottom:1em; - font-family: "biolinum", monospace; - font-size: 29px; - line-height: 1.5; - letter-spacing: 0; -}*/ #content{ margin-top:1em; } @@ -95,7 +86,7 @@ a:hover{ hr, .separator hr { border:0; - border-top:1px dotted; + border-top:1px dotted #7e5211; color: black; margin-top:1em; margin-bottom:1em; @@ -178,7 +169,7 @@ pre{ display: inline; } .summary img{ - margin:0 0 10px 0; + margin:0 0 1em 0; } .hentry{ display: inline-block; @@ -194,7 +185,7 @@ pre{ font-size: 190%; font-weight: bold; line-height: 1.10; - /*hyphens:auto;*/ + margin:0; } .hentry .article-info .entry-title a{ text-decoration: none; @@ -204,9 +195,16 @@ pre{ font-size: 14.4px; font-weight: normal; } + .event-details{ + font-weight: bold; + margin:.5em 0 1em 0; + } /****************************/ /* article */ +.article-info, .post-info{ + color:#7e5211; +} .article-info{ margin-bottom:1em; } diff --git a/themes/cetcat/templates/article.html b/themes/cetcat/templates/article.html index e3e8a134d..86144b5c0 100644 --- a/themes/cetcat/templates/article.html +++ b/themes/cetcat/templates/article.html @@ -22,23 +22,17 @@
{{ article.title }}
+
+ {% if article.start %} + {{ article.start }} + {% endif %} +
{{ article.content }}
-
- - {% if article.start %} - {% if url == '/en'%} - When? {{ article.start }} - {% else %} - Wanneer? {{ article.start }} - {% endif %} - {% endif %} - -
{% if article.category %}
diff --git a/themes/cetcat/templates/index.html b/themes/cetcat/templates/index.html index 38c67ab36..db904694c 100644 --- a/themes/cetcat/templates/index.html +++ b/themes/cetcat/templates/index.html @@ -11,6 +11,11 @@
{{ article.title }} +
+ {% if article.start %} + {{ article.start }} + {% endif %} +
{{ article.summary }} @@ -25,17 +30,6 @@
-
- - {% if article.start %} - {% if DEFAULT_LANG == 'en'%} - When? {{ article.start }} - {% elif DEFAULT_LANG == 'nl' %} - Wanneer? {{ article.start }} - {% endif %} - {% endif %} - -
{% if article.category %}