diff --git a/theme/wttf/static/main.css b/theme/wttf/static/main.css index e31768f..84c7138 100644 --- a/theme/wttf/static/main.css +++ b/theme/wttf/static/main.css @@ -39,16 +39,17 @@ body{ margin:0px; font-size: 14px; font-family: "headers"; - - /* oranje salmon */ - /*background: linear-gradient(to bottom, #ff7b43ff, salmon, #ff7b43ff, salmon);*/ - - /* licht blauwig/paars */ background: linear-gradient(to bottom, #dcdeff, #ffd0cb, #dcdeff, #ffd0cb); - word-break: normal; color:#3c0e02; + display: flex; + flex-direction: column; + min-height: 100vh; } + /* flex flow -- to keep the footer sticked at the bottom*/ + section#content{ + flex: 1; + } h1{ font-size: 28px; line-height:40px; @@ -71,7 +72,7 @@ h2{ } /* small headlines on index.html */ h2.break{ - border-bottom:20px solid rgba(240,240,240,0.4); + border-bottom:20px solid rgba(255, 255, 255, 0.48); margin:20px 20px 22px 20px; font-size: 12px; } @@ -123,23 +124,7 @@ section{ .box{ margin:20px 0 0 20px; padding:10px 20px; - - /* grey */ - background-color: rgba(240,240,240,0.4); - - /* green */ - /*background-color: rgb(122, 233, 139); */ - - /* blue */ - /*background-color: rgb(139, 198, 255); */ - - /* lila */ - /*background-color: rgb(220, 205, 221); */ - - /* donker oranje/bruin */ - /*background-color: rgba(93, 44, 44, 0.17); */ - - /*border:1px solid #3c0e02;*/ + background-color: rgba(255, 255, 255, 0.48); } /* blobs */ @@ -153,20 +138,17 @@ section{ .events h1{ background-color: white; } - .post{ - background-color: rgba(240,240,240,0.4); - } header{ position: relative; width: 100%; top:0; left:0; - margin-top:30px; /* to leave some space for the menu */ } #menu-wrapper{ position: relative; width: calc(100% - 242px); + z-index: 1; } #title{ padding: 31px 40px; @@ -185,6 +167,7 @@ header{ color:black; padding: 0.25em 0 0.25em 0.5em; margin:0 0.9em 0 0.5em; + z-index: 10; } #menu{ display: none; @@ -198,7 +181,7 @@ header{ } header #subtitle, header #logo{ position: absolute; - top:-20px; + top:0px; right:20px; width: 100px; height: 104px; @@ -224,9 +207,10 @@ header{ } #intro{ display: inline-block; - width: calc(60% - 42px); - font-size: 17px; - line-height: 1.35; + width: calc(60% - 120px); + font-size: 18px; + line-height: 1.7; + padding:30px 60px; } #intro #intro_wrapper{ margin: 5px 0px 0; @@ -236,9 +220,10 @@ header{ } .gallery{ display: inline-block; + float: right; width: calc(40% - 60px); vertical-align: top; - margin: 20px 0 0 17px; + margin: 20px 20px 0 0; } h2.break#gallery{ margin:-4px 0 20px 0; @@ -248,6 +233,29 @@ header{ width: 50%; border-radius: 15px 50px; } + .post { + position: relative; + display: inline-block; + width: calc(60% - 40px); + left:20px; + margin:0; + clear: both; + } + .post:last-of-type{ + margin-bottom:20px; + } + h2#posts{ + width: 60%; + } + .post h1{ + font-size: 18px; + line-height: 1.3; + margin-top:10px; + } + article{ + margin-left: 10px; + } + .events .event{ display: inline-block; vertical-align: top; @@ -256,6 +264,7 @@ header{ max-width: 600px; padding:30px; margin-top:20px; + margin-bottom:20px; } .events h2.break{ margin-bottom:0; @@ -270,29 +279,13 @@ header{ padding: 2em; text-align: center; } - .post { - position: relative; - width: calc(100% - 82px); - left:20px; - margin:0; - clear: both; - } - .post:last-of-type{ - margin-bottom:20px; - } - .post h1{ - font-size: 18px; - } - article{ - margin-left: 10px; - } .entry-title a{ color:#3c0e02; text-decoration: none; } .entry-subtitle{ text-align:left; - margin:-10px 0 15px; + margin:0 0 15px; color:#3c0e02; font-size: 12px; } @@ -395,6 +388,7 @@ header{ } footer{ + bottom:0; width: calc(100% - 40px); margin:0; padding:20px; @@ -438,17 +432,31 @@ footer{ } #menu-wrapper, #intro, .events, .gallery .img a img, .gallery .img a, .post, footer, footer p, #content.article, #content.article .entry-content, #content.article .entry-content .img{ width: 100%; - min-width: 100%; + /*min-width: 100%;*/ + } + #intro{ + width: calc(100% - 40px); + padding:20px 40px; + } + .gallery h2.break, h2.break#posts, .events h2.break{ + width: calc(50% + 20px); } .gallery{ - width: calc(100% + 44px); + position: relative; + width: calc(100% + 40px); + margin: 20px 0; + float: none; + left: 20px; } .events .event{ width: calc(100% - 20px); min-width: 0; + margin-bottom:0; + } + .events .event:last-of-type{ + margin-bottom:20px; } .gallery h2.break{ - width: calc(100% - 40px); margin-top:20px; } #content.article .entry-content h1{ diff --git a/theme/wttf/templates/base.html b/theme/wttf/templates/base.html index 95ef6bb..55d6f4c 100644 --- a/theme/wttf/templates/base.html +++ b/theme/wttf/templates/base.html @@ -8,7 +8,7 @@ {% from 'syndication.html' import syndication with context %} {{ syndication(article) }} - + {% if FEED_ALL_ATOM %} {% endif %} diff --git a/theme/wttf/templates/index.html b/theme/wttf/templates/index.html index 4148891..b6a35ea 100644 --- a/theme/wttf/templates/index.html +++ b/theme/wttf/templates/index.html @@ -4,20 +4,14 @@
{% block indexpage %} {% for page in pages %} - {% if page.title == 'ii-gallery' %} -
- - {{ page.content }} -
- {% endif %} - {% if page.title == 'i-introduction' %} + {% if page.title == 'Federated Ecosystems' %}
-
{{ page.content }}
+
{{ page.summary }} → read more
{% endif %} - {% if page.title == 'iii-agenda' %} -
-

Wtt�F events

+ {% if page.title == 'Gallery' %} +
+ {{ page.content }}
{% endif %} @@ -25,7 +19,7 @@ {% endblock indexpage %}

Wtt�F posts

{% for article in articles_page.object_list %} - {% if loop.index <= 25 %} + {% if article.category != 'gathering' %}

@@ -48,49 +42,15 @@

- {% if loop.index < 25 %} - {% if loop.last %} -
- {% endif %} - {% endif %} - {# other items #} - {% else %} - {% if loop.first %} - -
-
    - {% endif %} -
  1. -
    -
    -

    - {{ article.title }} -

    -
    - - {{ article.category }} - - about - - {% for tag in article.tags %} - - - - {% endfor %} - - published on - {{ article.date }} -
    -
    - -
    -

    {{ article.summary }}

    - read more -
    -
    -
    2. {% endif %} -
+ {% endfor %} + {% for page in pages %} + {% if page.title == 'iii-agenda' %} +
+

Wtt�F gatherings

+ {{ page.content }} +
+ {% endif %} {% endfor %}
{% endif %} diff --git a/theme/wttf/templates/page.html b/theme/wttf/templates/page.html index 5ceb779..90699a8 100644 --- a/theme/wttf/templates/page.html +++ b/theme/wttf/templates/page.html @@ -1,15 +1,33 @@ {% extends "base.html" %} {% block title %}{{ page.title }}{%endblock%} {% block content %} -

{{ page.title }}

- {% import 'translations.html' as translations with context %} - {{ translations.translations_for(page) }} - {{ page.content }} +
+

+ {{ page.title }} +

+
+ + {{ page.category }} + + about + + {% for tag in page.tags %} + + + + {% endfor %} + + , published on + {{ page.date | strftime('%d %B %Y')}} +
+
{{ page.content }}
+ {% if page.modified %}

Last updated: {{ page.locale_modified }}

{% endif %} +
{% endblock %}