diff --git a/_includes/media-in-list.html b/_includes/media-in-list.html index 1814e7f38166c1fa4316c6288026669a5b849715..8e768dc138b2edbf282f771e3fa74428f816c727 100644 --- a/_includes/media-in-list.html +++ b/_includes/media-in-list.html @@ -12,6 +12,6 @@ {{ video.excerpt | strip_html | markdownify | truncatewords: 60 }} </div> </article> - <div style="border-bottom: 1px dotted #000; height:1px; margin:0 auto; margin-bottom: 20px;"> + <div class="dotted-line"> </div> </li> diff --git a/_includes/post-list-article.html b/_includes/post-list-article.html index fb047731658c4c3941af059fa60c9b217427b456..ed7a392fa0e3febe080983bf20e9654a9da4e166 100644 --- a/_includes/post-list-article.html +++ b/_includes/post-list-article.html @@ -1,9 +1,17 @@ <li class="item item--post"> <article class="article article--post"> + {% if page.feature_image and page.feature_image_alt and counter > 0 -%} + {% if page.feature_image contains '://' -%} + <a href="{{ site.baseurl }}{{ page.url }}"><img class="articlefeatureimage" src="{{page.feature_image}}" alt="{{page.feature_image_alt}}"/></a> + {% else -%} + <a href="{{ site.baseurl }}{{ page.url }}"><img class="articlefeatureimage" src="{{site.baseurl}}/images/thumbnails/{{page.feature_image}}" alt="{{page.feature_image_alt}}"/></a> + {% endif -%} + {% endif -%} + {% include post-meta-top.html -%} - <h2><a href="{{ site.baseurl }}{{ page.url }}" style="">{{ page.title | markdownify | remove: '<p>' | remove: '</p>' }}</a></h2> + <h2><a href="{{ site.baseurl }}{{ page.url }}">{{ page.title | markdownify | remove: '<p>' | remove: '</p>' }}</a></h2> {% include post-meta.html -%} @@ -12,6 +20,6 @@ </div> </article> - <div style="border-bottom: 1px dotted #000; height:1px; margin:0 auto; background-color: transparent; margin-bottom: 20px;"> + <div class="dotted-line"> </div> </li> \ No newline at end of file diff --git a/_includes/post-list-frontpage.html b/_includes/post-list-frontpage.html index 616b91e5c06e411a9c44b63c184a394489b40099..298235a4db7fd8dae3fa9f5d2989725bf017c0e1 100644 --- a/_includes/post-list-frontpage.html +++ b/_includes/post-list-frontpage.html @@ -1,8 +1,10 @@ <section class="section typeset"> <ul class="list list--posts"> + {% assign counter = 0-%} {% assign frontpage_articles = (site.posts | where: "frontpage" , "true") -%} {% for page in frontpage_articles limit:10 -%} {% include post-list-article.html -%} + {% assign counter = counter | plus:1 %} {% endfor -%} </ul> </section> diff --git a/_includes/post-list.html b/_includes/post-list.html index 16df7cb0f25d77a6ff42c4d3154a1b9bc885e309..ee6bf3486076d597f1cd8d2207201239d912487b 100644 --- a/_includes/post-list.html +++ b/_includes/post-list.html @@ -1,8 +1,10 @@ {% if paginator.posts -%} <section class="section typeset"> <ul class="list list--posts"> + {% assign counter = 0-%} {% for page in paginator.posts -%} {% include post-list-article.html -%} + {% assign counter = counter | plus:1 %} {% endfor -%} </ul> {% include post-pagination.html -%} @@ -10,8 +12,10 @@ {% else -%} <section class="section typeset"> <ul class="list list--posts"> + {% assign counter = 0-%} {% for page in site.posts -%} {% include post-list-article.html -%} + {% assign counter = counter | plus:1 %} {% endfor -%} </ul> </section> diff --git a/_includes/post-pagination.html b/_includes/post-pagination.html index 19ff05d40a9f78e75339e52df9eb6c9f0e723ba1..57112ba736fd5185930334ec94d39fd4cb65e09a 100644 --- a/_includes/post-pagination.html +++ b/_includes/post-pagination.html @@ -1,17 +1,20 @@ <nav class="nav nav--paginator"> {% if paginator.previous_page %} - <a href="{{ site.baseurl }}{{ paginator.previous_page_path }}" class="pagination pagination--previous">← Previous</a> + {% capture prev_url %}{{ paginator.previous_page_path | replace: '.html', '' }}{% endcapture -%} + <a href="{{ site.baseurl }}{{prev_url}}" class="pagination pagination--previous">← neuer</a> {% else %} - <span class="pagination pagination--previous">← Previous</span> + <span class="pagination pagination--previous">← neuer</span> {% endif %} <span class="pagination pagination--counter">Page: {{ paginator.page }} of {{ paginator.total_pages }}</span> {% if paginator.next_page %} - <a href="{{ site.baseurl }}{{ paginator.next_page_path }}" class="pagination pagination--next">Next →</a> + {% capture next_url %}{{ paginator.next_page_path | replace: '.html', '' }}{% endcapture -%} + + <a href="{{ site.baseurl }}{{next_url}}" class="pagination pagination--next">älter →</a> {% else %} - <span class="pagination pagination--next">Next →</span> + <span class="pagination pagination--next">älter →</span> {% endif %} </nav> diff --git a/_includes/project-list.html b/_includes/project-list.html index 80abba32d789ac101385973830a0488206fd57d3..54efa1f09dbf8bfc8fb379d4701d6de5d8261553 100644 --- a/_includes/project-list.html +++ b/_includes/project-list.html @@ -28,11 +28,11 @@ <h2><a href="{{ site.baseurl }}{{ project.url }}">{{ project.name | markdownify | remove: '<p>' | remove: '</p>' }}</a></h2> {% if project.image -%} {% if project.image contains '://' -%} - <div class=projectthumbnail style="background-image: url({{project.image}}); height: 200px; width: 100%; margin-right: auto; margin-left: auto; margin-top: 10px;"> - </div> + <a href="{{ site.baseurl }}{{ project.url }}"><div class=projectthumbnail style="background-image: url({{project.image}}); height: 200px; width: 100%; margin-right: auto; margin-left: auto; margin-top: 10px;"> + </div></a> {% else -%} - <div class=projectthumbnail style="background-image: url({{site.baseurl}}/images/thumbnails/{{project.image}}); height: 200px; width: 100%; margin-right: auto; margin-left: auto; margin-top: 10px;"> - </div> + <a href="{{ site.baseurl }}{{ project.url }}"><div class=projectthumbnail style="background-image: url({{site.baseurl}}/images/thumbnails/{{project.image}}); height: 200px; width: 100%; margin-right: auto; margin-left: auto; margin-top: 10px;"> + </div></a> {% endif -%} {% endif -%} <small class="small post-meta">Letztes Update: <time datetime="{{ page.date | date_to_xmlschema }}" class="time">{{lastUpdate}}</time></small> diff --git a/_layouts/page.html b/_layouts/page.html index 5e2664c5359f1e80b1cb6235b13f8970955c7c1c..8c67e22968fe24b79d034355549be0e2152a617b 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -8,7 +8,7 @@ layout: default <article class="article article--page content typeset"> - <h1>{{ page.title }}</h1> + <h1 class="articletitle">{{ page.title }}</h1> {{ content }} diff --git a/_layouts/post.html b/_layouts/post.html index eef92bd938a997b84f2a6334f44259206b7dbef4..9a5458bb696d8cc4ca62c3415f69157ff9cdbad0 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -11,7 +11,7 @@ layout: default <article class="article article--post blogpost content typeset"> {% include post-meta-top.html -%} - <h1>{{ page.title | markdownify | remove: '<p>' | remove: '</p>' }}</h1> + <h1 class="articletitle">{{ page.title | markdownify | remove: '<p>' | remove: '</p>' }}</h1> {% include post-meta.html -%} {{ content }} diff --git a/_posts/blog/2022-01-07-ffhl-jahresrueckblick.markdown b/_posts/blog/2022-01-07-ffhl-jahresrueckblick.markdown index 538d55ce5b242bf1ad58222eab32fe7c1f0fea9f..4aadbea2cb09ccc9afffe744057734c215799196 100644 --- a/_posts/blog/2022-01-07-ffhl-jahresrueckblick.markdown +++ b/_posts/blog/2022-01-07-ffhl-jahresrueckblick.markdown @@ -5,6 +5,8 @@ date: 2022-01-07 20:00:00 +0200 comments: true uid: d1e316ed-374f-4978-ba20-d1ae6b5cb665 image: "/images/projects/ffhl/jls_pano.jpg" +feature_image: "https://chaotikum.org/images/projects/ffhl/jls_pano.jpg" +feature_image_alt: "Ãœberblick über die Stadt Lübeck bei sehr gutem Wetter" categories: - blog tags: diff --git a/_posts/blog/2023-03-01-freitalk-lichtechnik.markdown b/_posts/blog/2023-03-10-freitalk-lichtechnik.markdown similarity index 97% rename from _posts/blog/2023-03-01-freitalk-lichtechnik.markdown rename to _posts/blog/2023-03-10-freitalk-lichtechnik.markdown index 13327cd49304a449e2bd26cda330016349f96c5f..a5a7107a3b33dd4a3bcde4b45775a11f3e3ccfde 100644 --- a/_posts/blog/2023-03-01-freitalk-lichtechnik.markdown +++ b/_posts/blog/2023-03-10-freitalk-lichtechnik.markdown @@ -1,7 +1,7 @@ --- layout: post title: "Freitalk N8: Lichttechnik auf Veranstaltungen - Technologien, Protokolle und mehr." -date: 2023-03-01 20:00:00 +0100 +date: 2023-03-10 20:00:00 +0100 comments: true uid: 38a3c002-785c-4fa9-a212-967ec52b6ed3 categories: diff --git a/_posts/blog/2023-03-11-tag-des-offenen.hackspaces.md b/_posts/blog/2023-03-15-tag-des-offenen.hackspaces.md similarity index 86% rename from _posts/blog/2023-03-11-tag-des-offenen.hackspaces.md rename to _posts/blog/2023-03-15-tag-des-offenen.hackspaces.md index 9cfe5d6b59c03777b31086407a5a21a94e1c2fc0..cc46e0bb3fcacbae0de70ad0a5cf9bac48d90015 100644 --- a/_posts/blog/2023-03-11-tag-des-offenen.hackspaces.md +++ b/_posts/blog/2023-03-15-tag-des-offenen.hackspaces.md @@ -13,4 +13,4 @@ Am 25. März ist der internationale Tag des offenen Hackspaces. Auch in Lübeck. <!--more--> -hier mehr Text \ No newline at end of file +Der Nobreakspace wird von 15:00 bis 20:00 Uhr geöffnet sein. \ No newline at end of file diff --git a/_sass/_normalize.scss b/_sass/_normalize.scss index 1d0007e8d2f5b7103aeb8cab22c23a5409daba2f..6e88dbda795590c9b02f388291ab0b1be1ecbfcd 100644 --- a/_sass/_normalize.scss +++ b/_sass/_normalize.scss @@ -6,7 +6,7 @@ */ html { - font-family: sans-serif; /* 1 */ + font-family: "TabletGothic","Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } @@ -27,15 +27,12 @@ h2 a { line-height: 1.5; } -.chaotikum-about { +.articletitle { font-family: "TabletGothic","Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif; } -.teaser { - font-size: 1rem; - letter-spacing: .03em; - line-height: 1.5; - font-family: "TabletGothic","Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif; +.chaotikum-about { + font-family: "TabletGothic","Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif; } .chaotikum-description { @@ -109,6 +106,15 @@ figcaption { vertical-align: top; } +.dotted-line { + border-bottom: 1px dotted #000; + height:1px; + margin:0 auto; + background-color: transparent; + margin-top: 20px; + margin-bottom: 20px; +} + .byline { font: italic small-caps bold; } @@ -121,6 +127,14 @@ figcaption { color: #EFEFEF; } +.articlefeatureimage { + aspect-ratio: 16/9; + width: 100%; + + object-fit: cover; + object-position: left; +} + @media (min-width: 643px) { .aside { margin-top: -80px; @@ -131,6 +145,21 @@ figcaption { .statusmobile { display: none; } + .teaser { + font-size: 1rem!important; + letter-spacing: .03em!important; + line-height: 1.5!important; + font-family: "TabletGothic","Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif; + } + .articlefeatureimage { + display: none; + } +} + +@media (max-width: 643px) { + .teaser { + font-family: "TabletGothic","Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif; + } } #spaceopen { @@ -388,7 +417,6 @@ button, input, select, textarea { - font: inherit; /* 1 */ margin: 0; /* 2 */ } diff --git a/_sass/sassline-base/_typography.scss b/_sass/sassline-base/_typography.scss index 13f6051599e7f04c3eb2d56f13439d2c12645c13..6ef705944bf9f8083c82825c4ff21c7c6c728409 100755 --- a/_sass/sassline-base/_typography.scss +++ b/_sass/sassline-base/_typography.scss @@ -49,12 +49,10 @@ a { // background-image: linear-gradient(to bottom,rgba(0, 0, 0, 0) 50%,$hoverColour 50%); // } // } - - // Paragraphs. OpenType ligatures and oldstyle figures enabled if available. +// +// // Paragraphs. OpenType ligatures and oldstyle figures enabled if available. p { @include baseline($fontsize: zeta, $font: $bodytype, $lineheight: 2, $below: 2, $breakpoint: all); - - font-feature-settings: 'kern', 'onum', 'liga'; } figure{