From fccd469477ddd4cc9ba8178166ce9179e2d24437 Mon Sep 17 00:00:00 2001 From: teldra Date: Sat, 26 Mar 2022 22:14:04 +0100 Subject: [PATCH] clean
--- themes/buha/assets/css/layout.css | 71 +++++------------------- themes/buha/layouts/_default/single.html | 52 +++++++++-------- 2 files changed, 45 insertions(+), 78 deletions(-) diff --git a/themes/buha/assets/css/layout.css b/themes/buha/assets/css/layout.css index e2af413b..b2d468b5 100644 --- a/themes/buha/assets/css/layout.css +++ b/themes/buha/assets/css/layout.css @@ -49,15 +49,6 @@ main h1 { color: var(--text-header); } -#articledata { - display: flex; - flex-direction: column-reverse; -} - -article h2 { - margin-top: 0; -} - footer { display: flex; justify-content: space-between; @@ -73,16 +64,6 @@ p a { text-decoration: underline; } -article { - display: flex; - flex-direction: column; - margin-bottom: 1rem; - background-color: var(--background); - padding: 1rem; - border-radius: 18px; - /*box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);*/ -} - article a:hover { text-decoration: none; } @@ -91,25 +72,6 @@ article p:first-child { margin: 0; } -article img { - width: 100%; - margin-top: 1rem; - margin-bottom: 1rem; -} - -/*.button { - background-color: var(--background); - margin-top: 0.1rem; - margin-bottom: 0.1rem; - padding-left: 0.6rem; - padding-right: 0.6rem; - border-radius: 25px; -} -*/ -#readmore { - margin-top: 1rem; -} - #nav-posts { display: flex; flex-direction: column; @@ -120,8 +82,17 @@ article img { margin-left: .5rem; } - /* Extra small devices (phones, 600px and down) */ +#articlecontent { + display: flex; + flex-direction: column; } + +#articledata { + display: flex; + flex-direction: column-reverse; +} + + /* Extra small devices (phones, 600px and down) */ @media only screen and (max-width: 600px) {...} /* Small devices (portrait tablets and large phones, 600px and up) */ @@ -129,11 +100,6 @@ article img { #headerinner { padding: 10px; } - - header { - border: 0px solid var(--background-alt); - } - .container { min-height: 100vh; } @@ -163,24 +129,17 @@ article img { #articledata { display: flex; flex-direction: row; - margin-top: 1rem; + } + + #articletext { + margin-top: -1.3rem; } #articleimage { - flex-shrink: 0; margin-right: 1rem; - margin-top: .4rem; - width: 30%; + width: 30rem; } - #articletext-single { - margin-top: -1rem; - } - - article img { - width: auto; - margin-top: 0px; - } } /* Medium devices (landscape tablets, 768px and up) */ diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html index 44b2777a..2a918eb0 100644 --- a/themes/buha/layouts/_default/single.html +++ b/themes/buha/layouts/_default/single.html @@ -6,25 +6,31 @@ {{ partial "orga.html" . }} {{ else }} -

{{- .Title -}}

- {{ if and (ne .Params.when "") (ne .Params.when nil) }} -
{{ .Params.when }}
- {{ end }} - {{ if and (ne .Params.price "") (ne .Params.price nil) }} - {{ if eq .Params.price "free" }} -
Der Eintritt ist frei.
- {{ else }} -
Eintritt: {{ .Params.price }}
- {{ end }} - {{ end }} - {{ if and (ne .Params.register "") (ne .Params.register nil) }} -
Anmeldung unter {{ .Params.register | markdownify }} erwünscht
- {{ end }} - {{ if and (ne .Params.covid "") (ne .Params.covid nil) }} -
Es gilt die {{ .Params.covid }} Regel
- {{ end }} -
- {{- if .Resources.ByType "image" -}} +
+

{{- .Title -}}

+
+
+
+ {{ if and (ne .Params.when "") (ne .Params.when nil) }} +
{{ .Params.when }}
+ {{ end }} + {{ if and (ne .Params.price "") (ne .Params.price nil) }} + {{ if eq .Params.price "free" }} +
Der Eintritt ist frei.
+ {{ else }} +
Eintritt: {{ .Params.price }}
+ {{ end }} + {{ end }} + {{ if and (ne .Params.register "") (ne .Params.register nil) }} +
Anmeldung unter {{ .Params.register | markdownify }} erwünscht
+ {{ end }} + {{ if and (ne .Params.covid "") (ne .Params.covid nil) }} +
Es gilt die {{ .Params.covid }} Regel
+ {{ end }} +
+
+
+ {{- if .Resources.ByType "image" -}}
{{ range .Resources.ByType "image" }} {{- $pic := . -}} @@ -32,10 +38,12 @@ {{ end }}
- {{- end }} -
- {{- .Content -}} + {{- end }} +
+ {{- .Content -}} +
+
{{ end }} {{ end }}