From c84ffaa1dd8b28cdf7e094de70daaaf9ae50b6f8 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 27 Mar 2022 00:05:47 +0100
Subject: [PATCH] small fixes

---
 .gitignore                                |  1 +
 content/bunteshaus/foodsaving/index.de.md |  3 +-
 themes/buha/assets/css/layout.css         | 51 +++++++++++++--
 themes/buha/layouts/_default/list.html    | 79 +++++++++++------------
 themes/buha/layouts/_default/single.html  | 39 ++++++-----
 themes/buha/layouts/index.html            | 78 +++++++++++-----------
 6 files changed, 146 insertions(+), 105 deletions(-)

diff --git a/.gitignore b/.gitignore
index a20f5ffc..f76e93fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ public
 /resources/
 /public/
 .hugo_build.lock
+hugo_start.sh
diff --git a/content/bunteshaus/foodsaving/index.de.md b/content/bunteshaus/foodsaving/index.de.md
index dac3249d..755de1c5 100644
--- a/content/bunteshaus/foodsaving/index.de.md
+++ b/content/bunteshaus/foodsaving/index.de.md
@@ -3,8 +3,9 @@ title: "Food Saving"
 date: "2021-02-04T19:00:00+02:00"
 when: "Jeden Mittwoch 18:30-19:00Uhr & Samstags 15:00-15:30Uhr"
 recurrent: true
+contact: "foodsavingcelle@riseup.net"
 ---
-Die kostenfreie Verteilung von gespendeten und geretteten Lebensmitteln geht auch nach der Wiedereröffnung der Tafel weiter. Wann? Immer Mittwochs von 18.30 bis 19 Uhr und Samstags von 15 bis 15.30 Uhr. Spenden?  Mitmachen? Wer mitmachen oder uns unterstützen möchte, kann sich per Mail an foodsavingcelle@riseup.net wenden, sodass wir bei Bedarf nachfragen können.
+Die kostenfreie Verteilung von gespendeten und geretteten Lebensmitteln geht auch nach der Wiedereröffnung der Tafel weiter. Wann? Immer Mittwochs von 18.30 bis 19 Uhr und Samstags von 15 bis 15.30 Uhr. Spenden?  Mitmachen? Wer mitmachen oder uns unterstützen möchte, kann sich per Mail melden, sodass wir bei Bedarf nachfragen können.
 <!--more-->
 Pressemitteilung 12. Mai 2020
 
diff --git a/themes/buha/assets/css/layout.css b/themes/buha/assets/css/layout.css
index b2d468b5..72d512e7 100644
--- a/themes/buha/assets/css/layout.css
+++ b/themes/buha/assets/css/layout.css
@@ -14,8 +14,8 @@
 }
 
 main h1 {
-	margin-top: .2rem;
-	margin-bottom: .2rem;
+	margin-top: 1rem;
+	margin-bottom: 0rem;
 }
 
 .right-sidebar {
@@ -72,6 +72,10 @@ article p:first-child {
 	margin: 0;
 }
 
+article #readmore {
+	margin-top: 1rem;
+}
+
 #nav-posts {
 	display: flex;
 	flex-direction: column;
@@ -82,16 +86,43 @@ article p:first-child {
 	margin-left: .5rem;
 }
 
+article {
+	display: flex;
+	flex-direction: column;
+	margin-bottom: 1rem;
+	padding: 1rem;
+}
+
+article h2 {
+	margin: 0;
+}
+
+#articlemeta {
+	margin-bottom: 1rem;
+}
+
 #articlecontent {
 	display: flex;
 	flex-direction: column;
 }
 
+#articleimage {
+	margin-top: 1rem;
+}
+
 #articledata {
 	display: flex;
 	flex-direction: column-reverse;
 }
 
+.articlebgcol1 {
+	background-color: var(--background);
+}
+
+#readmore {
+	margin-bottom: 1rem;
+}
+
  /* Extra small devices (phones, 600px and down) */
 @media only screen and (max-width: 600px) {...}
 
@@ -131,13 +162,19 @@ article p:first-child {
 		flex-direction: row;
 	}
 
-	#articletext {
-		margin-top: -1.3rem;
+	#articleimage {
+		margin-top: .5rem;
+		display: flex;
+		flex-direction: column;
+		flex-shrink: 0;
+		margin-right: 1rem;
+		max-width: 15rem;
+		min-width: 1rem;
+		height: 100%;
 	}
 
-	#articleimage {
-		margin-right: 1rem;
-		width: 30rem;
+	.borderrad25 {
+		border-radius: 25px;
 	}
 
 }
diff --git a/themes/buha/layouts/_default/list.html b/themes/buha/layouts/_default/list.html
index 58c9cfcb..3262697c 100644
--- a/themes/buha/layouts/_default/list.html
+++ b/themes/buha/layouts/_default/list.html
@@ -16,48 +16,47 @@
 	        {{- $paginator = .Paginate .RegularPagesRecursive.ByLastmod.Reverse -}}
 	{{- end -}}
 	{{- range first 5 $paginator.Pages -}}
-			<article>
-				<a href="{{- .Permalink -}}">
-					<h2>{{- .Title -}}</h2>
-					{{ if .Params.when }}
-						<div style="margin-bottom: .4em;"><b>{{ .Params.when }}</b></div>
+	<article class="articlebgcol1 borderrad25"><a href="{{- .Permalink -}}">
+	<div id="articletitle">
+		<h2>{{- .Title -}}</h2>
+	</div>
+	<div id="articlecontent">
+		<div id="articlemeta">
+				{{ if and (ne .Params.when "") (ne .Params.when nil) }}
+					<div style="margin-bottom: .4em;"><b>{{ .Params.when }}</b></div>
+				{{ end }}
+		                {{ if and (ne .Params.price "") (ne .Params.price nil) }}
+					{{ if eq .Params.price "free" }}
+					        <div style="margin-bottom: .4em;">Der Eintritt ist frei.</div>
+					{{ else }}
+					        <div style="margin-bottom: .4em;">Eintritt: {{ .Params.price }}</div>
 					{{ end }}
-			                {{ if ne .Params.price nil }}
-						{{ if eq .Params.price "free" }}
-						        <div style="margin-bottom: .4em;">Der Eintritt ist frei.</div>
-						{{ else }}
-						        <div style="margin-bottom: .4em;">Eintritt: {{ .Params.price }}</div>
-						{{ end }}
-				        {{ end }}
-				        {{ if ne .Params.register nil }}
-				                <div>Anmeldung unter {{ .Params.register }} erwünscht</div>
-				        {{ end }}
-				        {{ if ne .Params.covid nil }}
-				                <div>Es gilt die {{ .Params.covid }} Regel</div>
-				        {{ end }}
-					<div id="articledata">
-					{{- if ne .Section .Site.Params.hiddenfolder -}}
-						{{- if .Resources.ByType "image" -}}
-							<div id="articleimage">
-								{{- $pic := index (.Resources.ByType "image") 0 -}}
-								{{- $thumb := $pic.Resize "1024x" }}
-								<img src="{{- $thumb.Permalink -}}"/>
-							</div>
-						{{- end }}
-						<div id="articletext">
-						    {{- if .Params.description -}}
-						    {{- .Params.description | plainify -}}
-						    {{- else -}}
-						    {{- .Summary | plainify -}}
-						    {{- end }}
-						    {{ if .Truncated }}
-								<div id="readmore">{{- i18n "readmore" -}}..</div>
-							{{ end }}
+			        {{ end }}
+		</div>
+		<div id="articleinner">
+			<div id="articledata">
+					{{- if .Resources.ByType "image" -}}
+						<div id="articleimage">
+							{{- $pic := index (.Resources.ByType "image") 0 -}}
+							{{- $thumb := $pic.Resize "1024x" }}
+							<img src="{{- $thumb.Permalink -}}"/>
 						</div>
-					</div>
-					{{- end -}}
-				</a>
-			</article>
+					{{- end }}
+				<div id="articletext">
+							    {{- if .Params.description -}}
+							    {{- .Params.description -}}
+							    {{- else -}}
+							    {{- .Summary -}}
+							    {{- end }}
+							    {{ if .Truncated }}
+									<div id="readmore">{{- i18n "readmore" -}}..</div>
+								{{ end }}
+				</div>
+			</div>
+		</div>
+	</div>
+</a></article>
+
 		{{- end }}
 		<div id="pagination">
 			<!-- Number of links either side of the current page. -->
diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html
index 2a918eb0..74d0fdcb 100644
--- a/themes/buha/layouts/_default/single.html
+++ b/themes/buha/layouts/_default/single.html
@@ -9,41 +9,46 @@
 	<div id="articletitle">
 		<h1>{{- .Title -}}</h1>
 	</div>
+<article>
 	<div id="articlecontent">
 		<div id="articlemeta">
 				{{ if and (ne .Params.when "") (ne .Params.when nil) }}
 					<div style="margin-bottom: .4em;"><b>{{ .Params.when }}</b></div>
 				{{ end }}
-		                {{ if and (ne .Params.price "") (ne .Params.price nil) }}
+		    {{ if and (ne .Params.price "") (ne .Params.price nil) }}
 					{{ if eq .Params.price "free" }}
 					        <div style="margin-bottom: .4em;">Der Eintritt ist frei.</div>
 					{{ else }}
 					        <div style="margin-bottom: .4em;">Eintritt: {{ .Params.price }}</div>
 					{{ end }}
-			        {{ end }}
-			        {{ if and (ne .Params.register "") (ne .Params.register nil) }}
-			                <div>Anmeldung unter {{ .Params.register | markdownify }} erwünscht</div>
-			        {{ end }}
-			        {{ if and (ne .Params.covid "") (ne .Params.covid nil) }}
-			                <div>Es gilt die {{ .Params.covid }} Regel</div>
-			        {{ end }}
+			  {{ end }}
+        {{ if and (ne .Params.register "") (ne .Params.register nil) }}
+                <div>Anmeldung unter {{ .Params.register | markdownify }} erwünscht</div>
+        {{ end }}
+        {{ if and (ne .Params.covid "") (ne .Params.covid nil) }}
+                <div>Es gilt die {{ .Params.covid }} Regel</div>
+        {{ end }}
+        {{ if and (ne .Params.contact "") (ne .Params.contact nil) }}
+                <div>Kontakt: <a href="mailto://{{ .Params.contact }}">{{ .Params.contact }}</a></div>
+        {{ end }}
 		</div>
 		<div id="articleinner">
 			<div id="articledata">
-				{{- if .Resources.ByType "image" -}}
-				<div id="articleimage">
-					{{ range .Resources.ByType "image" }}
-						{{- $pic := . -}}
-						{{- $thumb := $pic.Resize "1024x" }}
-						<a href="{{ . }}"><img src="{{- $thumb.Permalink -}}"/></a>
-					{{ end }}
-				</div>
-				{{- end }}
+					{{- if .Resources.ByType "image" -}}
+					<div id="articleimage">
+						{{ range .Resources.ByType "image" }}
+							{{- $pic := . -}}
+							{{- $thumb := $pic.Resize "1024x" }}
+							<a href="{{ . }}"><img src="{{- $thumb.Permalink -}}"/></a>
+						{{ end }}
+					</div>
+					{{- end }}
 				<div id="articletext">
 				    {{- .Content -}}
 				</div>
 			</div>
 		</div>
 	</div>
+</article>
 {{ end }}
 {{ end }}
diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html
index ae22f67c..83fbbc03 100644
--- a/themes/buha/layouts/index.html
+++ b/themes/buha/layouts/index.html
@@ -12,49 +12,47 @@
 	{{- $paginator := slice -}}
     {{- $paginator = .Paginate $posts.ByLastmod.Reverse -}}
 	{{- range first 5 $paginator.Pages -}}
-			<article>
-				<a href="{{- .Permalink -}}">
-					<h2>{{ if and (isset .Params "categories") (eq .Section "events") }}{{ index .Params.categories 0 }}: {{ end }}{{- .Title -}}</h2>
-					{{ if .Params.when }}
-						<div style="margin-bottom: .4em;"><b>{{ .Params.when }}</b></div>
+	<article class="articlebgcol1 borderrad25"><a href="{{- .Permalink -}}">
+		<div id="articletitle">
+			<h2>{{- .Title -}}</h2>
+		</div>
+		<div id="articlecontent">
+		<div id="articlemeta">
+				{{ if and (ne .Params.when "") (ne .Params.when nil) }}
+					<div style="margin-bottom: .4em;"><b>{{ .Params.when }}</b></div>
+				{{ end }}
+		                {{ if and (ne .Params.price "") (ne .Params.price nil) }}
+					{{ if eq .Params.price "free" }}
+					        <div style="margin-bottom: .4em;">Der Eintritt ist frei.</div>
+					{{ else }}
+					        <div style="margin-bottom: .4em;">Eintritt: {{ .Params.price }}</div>
 					{{ end }}
-			                {{ if ne .Params.price nil }}
-						{{ if eq .Params.price "free" }}
-						        <div style="margin-bottom: .4em;">Der Eintritt ist frei.</div>
-						{{ else }}
-						        <div style="margin-bottom: .4em;">Eintritt: {{ .Params.price }}</div>
-						{{ end }}
-				        {{ end }}
-				        {{ if ne .Params.register nil }}
-				                <div>Anmeldung unter {{ .Params.register }} erwünscht</div>
-				        {{ end }}
-				        {{ if ne .Params.covid nil }}
-				                <div>Es gilt die {{ .Params.covid }} Regel</div>
-				        {{ end }}
-					<div id="articledata">
-					{{- if ne .Section .Site.Params.hiddenfolder -}}
-						{{- if .Resources.ByType "image" -}}
-							<div id="articleimage">
-								{{- $pic := index (.Resources.ByType "image") 0 -}}
-								{{- $thumb := $pic.Resize "1024x" }}
-								<img src="{{- $thumb.Permalink -}}"/>
-							</div>
-						{{- end }}
-						<div id="articletext">
-						    {{- if .Params.description -}}
-						    {{- .Params.description | plainify -}}
-						    {{- else -}}
-						    {{- .Summary | plainify -}}
-						    {{- end }}
-						    {{ if .Truncated }}
-								<div id="readmore">{{- i18n "readmore" -}}..</div>
-							{{ end }}
+			        {{ end }}
+		</div>
+			<div id="articleinner">
+				<div id="articledata">
+					{{- if .Resources.ByType "image" -}}
+						<div id="articleimage">
+							{{- $pic := index (.Resources.ByType "image") 0 -}}
+							{{- $thumb := $pic.Resize "1024x" }}
+							<img src="{{- $thumb.Permalink -}}"/>
 						</div>
+					{{- end }}
+					<div id="articletext">
+							    {{- if .Params.description -}}
+							    {{- .Params.description -}}
+							    {{- else -}}
+							    {{- .Summary -}}
+							    {{- end }}
+							    {{ if .Truncated }}
+									<div id="readmore">{{- i18n "readmore" -}}..</div>
+								{{ end }}
 					</div>
-					{{- end -}}
-				</a>
-			</article>
-		{{- end }}
+				</div>
+			</div>
+		</div>
+	</a></article>
+	{{- end }}
 		<div id="pagination">
 			<!-- Number of links either side of the current page. -->
 			{{ $adjacent_links := 2 }}