From 1af5f5490071c2d92bda90387196672137c5b22b Mon Sep 17 00:00:00 2001
From: Denys Konovalov <kontakt@denyskon.de>
Date: Sun, 30 Jul 2023 09:53:00 +0200
Subject: [PATCH] WIP

---
 layouts/index.html           | 115 ++++++++++++++---------------------
 layouts/partials/info.html   |   2 +-
 layouts/partials/termin.html |   2 +-
 layouts/termine/list.html    |  35 +++--------
 4 files changed, 56 insertions(+), 98 deletions(-)

diff --git a/layouts/index.html b/layouts/index.html
index b3c3617d..0401e452 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -56,7 +56,7 @@
   <div class="container">
     <div class="row align-items-center">
       {{ range .logos }}
-        <div class="col-md-3 col-6 order-1 order-md-2 mt-4">
+        <div class="col-md-3 col-6 mt-4">
           <a href="{{ .link }}" target="_blank" title="{{ .title }}"><img class="img-fluid w-100" src="{{ .image }}"></a>
         </div>
 		  {{ end }}
@@ -102,33 +102,27 @@
 {{ if $data.homepage.blog.enable }}
 <section class="section mb-4">
   <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <div class="d-flex align-items-center mb-4 justify-content-between">
-          <h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.blog.title }}</h2>
-          <div class="border-top w-100 border-primary d-none d-sm-block"></div>
-          <div>
-            <a href="{{ `blog` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block">Alle anzeigen</a>
-          </div>
-        </div>
+    <div class="d-flex align-items-center mb-4 justify-content-between">
+      <h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.blog.title }}</h2>
+      <div class="border-top w-100 border-primary d-none d-sm-block"></div>
+      <div>
+        <a href="{{ `blog` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block">Alle anzeigen</a>
       </div>
     </div>
     <div class="row justify-content-center">
       {{ if $data.ausblick.enable }}
       {{ with $data.ausblick }}
       <div class="col-lg-4 col-sm-6 mb-4 mb-lg-0 d-flex align-items-stretch">
-        <div class="card border-info rounded-0 hover-shadow mb-4">
-          <span class="position-absolute top-0 start-0 ms-5 translate-middle p-2 text-bg-info border border-light rounded-pill">
+        <div class="card border-info rounded-0 hover-shadow mb-2">
+          <span class="position-absolute top-0 start-0 ms-5 translate-middle p-2 text-bg-info border border-info rounded-pill">
             <i class="mdi mdi-pin me-2">Angeheftet</i>
           </span>        
           <img class="card-img-top rounded-0" src="{{ .image | relURL }}" alt="{{ .title }}" onclick="$('#{{ md5 .title }}').modal('show');">
           <div class="card-body d-flex flex-column">
-            <div class="row mb-2">
-              <div class="col-12">
-                <i class="mdi mdi-fountain-pen-tip me-2"></i>
-                {{ partial "authors" (dict "Site" $.Site "author" .author)}}
-              </div>
-            </div>
+            <span class="text-truncate mb-2">
+              <i class="mdi mdi-fountain-pen-tip me-2"></i>
+              {{ partial "authors" (dict "Site" $.Site "author" .author )}}
+            </span>
             <h4 class="card-title text-truncate" onclick="$('#{{ md5 .title }}').modal('show');">{{ .title }}</h4>
             <p class="card-text" onclick="$('#{{ md5 .title }}').modal('show');">{{ partial "summary" .content }}</p>
             <button type="button" class="btn btn-primary btn-sm mt-auto align-self-start" onclick="$('#{{ md5 .title }}').modal('show');">Mehr anzeigen</button>
@@ -151,25 +145,21 @@
 {{ with $data.homepage.success_banner }}
 <section class="section bg-cover" data-background="{{ .image | absURL }}" id="success">
   <div class="container">
-    <div class="row no-gutters">
-      <div class="col-12">
-        <div class="row feature-blocks bg-white justify-content-between">
-          {{ range .feature_item }}
-          <div class="col-xl-5 mb-xl-5 mb-4">
-            {{ with .image }}
-              <img src="{{ . }}" class="mb-xl-4 mb-lg-3 mb-4 feature-icon"></img>
-            {{ end }}
-            {{ with .icon }}
-              <i class="{{ . }} mb-xl-4 mb-lg-3 mb-4 feature-icon"></i>
-            {{ end }}
-            <h3 class="mb-xl-4 mb-lg-3 mb-4">{{ .name | markdownify }}</h3>
-            <div class="content">
-              {{ .content | markdownify }}
-            </div>
-          </div>
-          {{ end }}
+    <div class="row feature-blocks bg-white justify-content-between">
+      {{ range .feature_item }}
+      <div class="col-xl-5 mb-xl-5 mb-4">
+        {{ with .image }}
+          <img src="{{ . }}" class="mb-xl-4 mb-lg-3 mb-4 feature-icon"></img>
+        {{ end }}
+        {{ with .icon }}
+          <i class="{{ . }} mb-xl-4 mb-lg-3 mb-4 feature-icon"></i>
+        {{ end }}
+        <h3 class="mb-xl-4 mb-lg-3 mb-4">{{ .name | markdownify }}</h3>
+        <div class="content">
+          {{ .content | markdownify }}
         </div>
       </div>
+      {{ end }}
     </div>
   </div>
 </section>
@@ -179,15 +169,11 @@
 {{ if $data.homepage.ganztagsangebote.enable }}
 <section class="section">
   <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <div class="d-flex align-items-center mb-4 justify-content-between">
-          <h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.ganztagsangebote.title }}</h2>
-          <div class="border-top w-100 border-primary d-none d-sm-block"></div>
-          <div>
-            <a href="{{ `ganztagsangebote` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block">Alle anzeigen</a>
-          </div>
-        </div>
+    <div class="d-flex align-items-center mb-4 justify-content-between">
+      <h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.ganztagsangebote.title }}</h2>
+      <div class="border-top w-100 border-primary d-none d-sm-block"></div>
+      <div>
+        <a href="{{ `ganztagsangebote` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block">Alle anzeigen</a>
       </div>
     </div>
     <div class="row justify-content-center">
@@ -197,11 +183,6 @@
       </div>
       {{ end }}
     </div>
-    <div class="row">
-      <div class="col-12 text-center">
-        <a href="{{ `ganztagsangebote` | relURL }}" class="btn btn-sm btn-primary-outline d-sm-none d-inline-block">Alle anzeigen</a>
-      </div>
-    </div>
   </div>
 </section>
 {{ end }}
@@ -209,18 +190,14 @@
 {{ if $data.homepage.cta.enable }}
 {{ with $data.homepage.cta }}
 <section class="section bg-primary">
-  <div class="container">
-    <div class="row">
-      <div class="col-12 text-center">
-        <h2 class="text-white mb-0">{{ .title | markdownify }}</h2>
-        <h5 class="mb-4 text-white">{{ .subtitle | markdownify }}</h5>
-        {{ if .button.enable }}
-        {{ with .button }}
-        <a href="{{ .link | absURL }}" class="btn btn-secondary text-uppercase">{{ .label }}</a>
-        {{ end }}
-        {{ end }}
-      </div>
-    </div>
+  <div class="container text-center">
+    <h2 class="text-white mb-0">{{ .title | markdownify }}</h2>
+    <h5 class="mb-4 text-white">{{ .subtitle | markdownify }}</h5>
+    {{ if .button.enable }}
+    {{ with .button }}
+    <a href="{{ .link | absURL }}" class="btn btn-secondary text-uppercase">{{ .label }}</a>
+    {{ end }}
+    {{ end }}
   </div>
 </section>
 {{ end }}
@@ -233,15 +210,11 @@
 {{ if $data.homepage.termine.enable }}
 <section class="section bg-body-tertiary">
   <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <div class="d-flex align-items-center mb-4 justify-content-between">
-          <h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.termine.title }}</h2>
-          <div class="border-top w-100 border-primary d-none d-sm-block"></div>
-          <div>
-            <a href="{{`termine` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block text-nowrap">Alle anzeigen</a>
-          </div>
-        </div>
+    <div class="d-flex align-items-center mb-4 justify-content-between">
+      <h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.termine.title }}</h2>
+      <div class="border-top w-100 border-primary d-none d-sm-block"></div>
+      <div>
+        <a href="{{`termine` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block text-nowrap">Alle anzeigen</a>
       </div>
     </div>
     <div class="row justify-content-center px-2">
@@ -304,7 +277,7 @@
   <div class="container">
     <div class="row justify-content-center">
 		{{ range .logos }}
-        <div class="col-md-2 col-4 order-1 order-md-2 mb-4">
+        <div class="col-md-2 col-4 mb-4">
           <a href="{{ .link }}" target="_blank" title="{{ .title }}"><img class="img-fluid w-100" src="{{ .image }}"></a>
         </div>
 		{{ end }}
diff --git a/layouts/partials/info.html b/layouts/partials/info.html
index 1b7d1acd..81bbf000 100644
--- a/layouts/partials/info.html
+++ b/layouts/partials/info.html
@@ -10,7 +10,7 @@
       <div class="col-lg-6 col-sm-8">
         <div class="bg-white p-5">
           <h2 class="mb-4">{{ .title }}</h2>
-          <p class="text-justify">{{ .content | markdownify }}</p>
+          <p>{{ .content | markdownify }}</p>
         </div>
       </div>
     </div>
diff --git a/layouts/partials/termin.html b/layouts/partials/termin.html
index 2fe89195..7e5e0897 100644
--- a/layouts/partials/termin.html
+++ b/layouts/partials/termin.html
@@ -6,7 +6,7 @@
       {{ with .enddate }}<br>bis {{ time.Format "2 Jan 2006" . }}{{ end }}
     </div>
     <div class="col-md-9">
-      <div class="card-body h-100 d-flex flex-column justify-content-between">
+      <div class="card-body h-100 d-flex flex-column justify-content-around">
         <h4 class="card-title">{{ .title }}</h4>
         {{ with .location }}
         <div class="card-text">
diff --git a/layouts/termine/list.html b/layouts/termine/list.html
index eb866b02..8ac6ba80 100644
--- a/layouts/termine/list.html
+++ b/layouts/termine/list.html
@@ -2,32 +2,17 @@
 
 <section class="section">
   <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <div class="row gta-cat">
-          <div class="col-12">
-            <ul class="list-inline text-center filter-controls mb-5">
-              <li class="list-inline-item m-3 text-uppercase active" data-filter="all">Alle</li>
-              <li class="list-inline-item m-3 text-uppercase" data-filter="upcoming">Anstehend</li>
-              <li class="list-inline-item m-3 text-uppercase" data-filter="past">Vergangen</li>
-            </ul>
-          </div>
-        </div>
-        <noscript>
-          <style>
-            .gta-cat {
-              display: none;
-            }
-          </style>
-        </noscript>
-        <div class="filtr-container">
-          {{ range .Params.events }}
-          <div class="mb-2 mt-2 col-12 filtr-item" data-category="{{ if or (ge (.date | time.AsTime).Unix now.Unix) (and .enddate (ge (.enddate | time.AsTime).Unix now.Unix)) }}upcoming{{else}}past{{end}}" data-time="{{.date}}">
-            {{ partial "termin" . }}
-          </div>
-          {{ end }}
-        </div>
+    <ul class="list-inline text-center filter-controls mb-4">
+      <li class="list-inline-item m-3 text-uppercase active" data-filter="all">Alle</li>
+      <li class="list-inline-item m-3 text-uppercase" data-filter="upcoming">Anstehend</li>
+      <li class="list-inline-item m-3 text-uppercase" data-filter="past">Vergangen</li>
+    </ul>
+    <div class="filtr-container row">
+      {{ range .Params.events }}
+      <div class="filtr-item col-12" data-category="{{ if or (ge (.date | time.AsTime).Unix now.Unix) (and .enddate (ge (.enddate | time.AsTime).Unix now.Unix)) }}upcoming{{else}}past{{end}}" data-time="{{.date}}">
+        {{ partial "termin" . }}
       </div>
+      {{ end }}
     </div>
   </div>
 </section>