From cb59c2fbc878fe8b23d25169d244972bfeefa9b6 Mon Sep 17 00:00:00 2001 From: teldra Date: Sun, 12 Jun 2022 19:27:57 +0200 Subject: [PATCH] small fixes --- .../news/1997-09-04-Antifa-Cafe/index.de.md | 2 +- .../news/1998-10-12-Antifa-Cafe/index.de.md | 2 +- .../index.de.md | 2 + themes/buha/assets/scss/article.scss | 11 ++- themes/buha/assets/scss/font.scss | 46 ++++++++-- themes/buha/assets/scss/footer.scss | 35 +------- themes/buha/assets/scss/header.scss | 4 - themes/buha/assets/scss/init.scss | 40 --------- themes/buha/assets/scss/main.scss | 1 - .../layouts/partials/snippets/banner.html | 85 +++++++++++++++---- .../buha/layouts/partials/snippets/head.html | 3 +- 11 files changed, 123 insertions(+), 108 deletions(-) diff --git a/content/news/1997-09-04-Antifa-Cafe/index.de.md b/content/news/1997-09-04-Antifa-Cafe/index.de.md index 6815fbb..d60a2ca 100644 --- a/content/news/1997-09-04-Antifa-Cafe/index.de.md +++ b/content/news/1997-09-04-Antifa-Cafe/index.de.md @@ -1,5 +1,5 @@ --- -title: "Antifa Cafe" +title: "Antifa Café" lastmod: 1997-09-04T14:00:00+02:00 when: "04.09.1997, 19Uhr" tags: ["Antifa","Cafe"] diff --git a/content/news/1998-10-12-Antifa-Cafe/index.de.md b/content/news/1998-10-12-Antifa-Cafe/index.de.md index fddbcbf..f619dc1 100644 --- a/content/news/1998-10-12-Antifa-Cafe/index.de.md +++ b/content/news/1998-10-12-Antifa-Cafe/index.de.md @@ -1,5 +1,5 @@ --- -title: "Antifa-Cafe" +title: "Antifa-Café" lastmod: 1998-10-12T14:00:00+02:00 when: "12.10.1998, 20 Uhr" tags: ["Antifa","Informationsveranstaltungen","Antifachismus","Arbeitskreis Antifaschismus Magdeburg","Antifaschistische Aktion","Vortrag","Diskussionsveranstaltung"] diff --git a/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md b/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md index 17d85de..b20914a 100644 --- a/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md +++ b/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md @@ -23,6 +23,8 @@ Bier kostet 3 Euro, jedoch ist die Katzenmilch für euch umsonst. Bringt alle eu ``` ![lala](1) + ![lala](2) + ![lala](3) diff --git a/themes/buha/assets/scss/article.scss b/themes/buha/assets/scss/article.scss index 3bb6e12..6fed22c 100644 --- a/themes/buha/assets/scss/article.scss +++ b/themes/buha/assets/scss/article.scss @@ -1,5 +1,10 @@ article { - .article_content { + .article-image, .article-image > a { + display: flex; + justify-content: center; + flex-direction: column; + align-items: center; + margin-bottom: 1.5rem; } .articlemeta { margin-top: 1rem; @@ -8,6 +13,10 @@ article { font-weight: bold; } } + p { + margin-top: 2rem; + margin-bottom: 2rem; + } } diff --git a/themes/buha/assets/scss/font.scss b/themes/buha/assets/scss/font.scss index cdb6048..d4e9893 100644 --- a/themes/buha/assets/scss/font.scss +++ b/themes/buha/assets/scss/font.scss @@ -7,18 +7,46 @@ font-family: 'Nanum'; } -@media (min-width: 640px) { +// Breakpoints +$bp-small: 48em; // 768px +$bp-medium: 64em; // 1024px +$bp-large: 85.375em; // 1366px +$bp-xlarge: 120em; // 1920px +$bp-xxlarge: 160em; // 2560px -} -@media (min-width: 768px) { +// Media Queries +$mq-small: "(min-width: #{$bp-small})"; +$mq-medium: "(min-width: #{$bp-medium})"; +$mq-large: "(min-width: #{$bp-large})"; +$mq-xlarge: "(min-width: #{$bp-xlarge})"; +$mq-xxlarge: "(min-width: #{$bp-xxlarge})"; +$mq-retina: "(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)"; -} -@media (min-width: 1024px) { +// Font-Size +$base-font-size: .8em; -} -@media (min-width: 1280px) { +// Line-Height +$base-line-height: 1.5; +$header-line-height: 1.25; -} -@media (min-width: 1920px) { +body { + font-size: $base-font-size; + line-height: $base-line-height; + @media #{$mq-medium} { + font-size: $base-font-size*1.2; + line-height: $base-line-height*1.2; + } + + @media #{$mq-large} { + font-size: $base-font-size*1.3; + } + + @media #{$mq-xlarge} { + font-size: $base-font-size*1.4; + } + + @media #{$mq-xxlarge} { + font-size: $base-font-size*1.6; + } } diff --git a/themes/buha/assets/scss/footer.scss b/themes/buha/assets/scss/footer.scss index 3248eec..4d6fd04 100644 --- a/themes/buha/assets/scss/footer.scss +++ b/themes/buha/assets/scss/footer.scss @@ -1,11 +1,10 @@ .footer { flex-grow: 0; - min-height: 4rem; display: flex; justify-content: space-between; flex-wrap: wrap; margin-top: 1rem; - width: 100%; + width: 98vw; margin-left: auto; margin-right: auto; flex-direction: column-reverse; @@ -19,7 +18,7 @@ @media (min-width: 640px) { .footer { - max-width: 640px; + max-width: 89%; margin-left: auto; margin-right: auto; flex-direction: row; @@ -28,34 +27,4 @@ } } } -@media (min-width: 768px) { - .footer { - max-width: 768px; - margin-left: auto; - margin-right: auto; - } -} -@media (min-width: 1024px) { - .footer { - max-width: 1024px; - margin-left: auto; - margin-right: auto; - } -} -@media (min-width: 1280px) { - .footer { - max-width: 1280px; - margin-left: auto; - margin-right: auto; - } - -} -@media (min-width: 1920px) { - .footer { - max-width: 1920px; - margin-left: auto; - margin-right: auto; - } - -} diff --git a/themes/buha/assets/scss/header.scss b/themes/buha/assets/scss/header.scss index 26fc20e..87751e6 100644 --- a/themes/buha/assets/scss/header.scss +++ b/themes/buha/assets/scss/header.scss @@ -21,7 +21,6 @@ header { display: flex; flex-wrap: wrap; text-shadow: 0px 4px 4px var(--shadow-color); - font-size: 1rem; a { margin-left: .8rem; } @@ -41,9 +40,6 @@ header { width: auto; height: 7em; } - div { - font-size: 1.2rem; - } } } } diff --git a/themes/buha/assets/scss/init.scss b/themes/buha/assets/scss/init.scss index 24d5fb2..b28b04f 100644 --- a/themes/buha/assets/scss/init.scss +++ b/themes/buha/assets/scss/init.scss @@ -1,43 +1,3 @@ -// Breakpoints -$bp-small: 48em; // 768px -$bp-medium: 64em; // 1024px -$bp-large: 85.375em; // 1366px -$bp-xlarge: 120em; // 1920px -$bp-xxlarge: 160em; // 2560px -// Media Queries -$mq-small: "(min-width: #{$bp-small})"; -$mq-medium: "(min-width: #{$bp-medium})"; -$mq-large: "(min-width: #{$bp-large})"; -$mq-xlarge: "(min-width: #{$bp-xlarge})"; -$mq-xxlarge: "(min-width: #{$bp-xxlarge})"; -$mq-retina: "(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)"; -// Font-Size -$base-font-size: 1em; -// Line-Height -$base-line-height: 1.5; -$header-line-height: 1.25; - -body { - font-size: $base-font-size; - line-height: $base-line-height; - - @media #{$mq-medium} { - font-size: $base-font-size*1.2; - line-height: $base-line-height*1.2; - } - - @media #{$mq-large} { - font-size: $base-font-size*1.3; - } - - @media #{$mq-xlarge} { - font-size: $base-font-size*1.4; - } - - @media #{$mq-xxlarge} { - font-size: $base-font-size*1.6; - } -} diff --git a/themes/buha/assets/scss/main.scss b/themes/buha/assets/scss/main.scss index 561e808..14bdb61 100644 --- a/themes/buha/assets/scss/main.scss +++ b/themes/buha/assets/scss/main.scss @@ -13,7 +13,6 @@ main { width: 98vw; margin-left: auto; margin-right: auto; - min-height: 90vh; } aside { diff --git a/themes/buha/layouts/partials/snippets/banner.html b/themes/buha/layouts/partials/snippets/banner.html index ee0dfaf..9c78376 100644 --- a/themes/buha/layouts/partials/snippets/banner.html +++ b/themes/buha/layouts/partials/snippets/banner.html @@ -4,10 +4,10 @@ {{ if not $title }} {{ $title = .Title }} {{ end }} +{{ $good_w := "1920"}} +{{ $good_h := "550"}} {{ $px := string "400" }} {{ $fill := string (printf "1280x%s smart" $px) }} -{{ $all := "" }} -{{ $style := safeCSS "text-shadow: 0px 3px 0px #b2a98f, 0px 14px 10px rgba(0,0,0,0.15), 0px 24px 2px rgba(0,0,0,0.1), 0px 34px 30px rgba(0,0,0,0.1)" }} {{ $what := "none" }} {{ $img := "none" }} {{ if eq .Kind "home" }} @@ -21,42 +21,89 @@ {{ if resources.GetMatch $banner }} {{ $img = (resources.GetMatch $banner).Fill $fill }} {{ end }} -{{ $height := safeCSS (printf "min-height: calc(%spx - 5rem); max-height: calc(%spx - 5rem);" $px $px) }} {{ if and (resources.GetMatch $banner) (ne .Params.banner false) }} - {{ $height = safeCSS (printf "height: calc(%spx - 5rem);" (string $img.Height)) }} {{ else if and (.Resources.Match "banner*") (ne .Params.banner false) }} {{ $img = (.Resources.GetMatch "banner*").Fill $fill }} - {{ $height = safeCSS (printf "height: calc(%spx - 5rem);" (string $img.Height)) }} -{{ else if and (.Resources.ByType "image") (ne .Params.banner false) $all }} +{{ else if and (.Resources.ByType "image") (ne .Params.banner false) }} {{ $img = (index (.Resources.ByType "image") 0).Fill $fill }} - {{ $height = safeCSS (printf "height: calc(%spx - 5rem);" (string $img.Height)) }} @@ -64,7 +111,11 @@ {{ end }} diff --git a/themes/buha/layouts/partials/snippets/head.html b/themes/buha/layouts/partials/snippets/head.html index 43a8a68..bde4bbe 100644 --- a/themes/buha/layouts/partials/snippets/head.html +++ b/themes/buha/layouts/partials/snippets/head.html @@ -6,6 +6,7 @@ {{ $water := resources.Get "css/water.css" | resources.ToCSS }} {{ $container := resources.Get "scss/container.scss" | resources.ToCSS }} {{ $font := resources.Get "scss/font.scss" | resources.ToCSS }} +{{ $init := resources.Get "scss/init.scss" | resources.ToCSS }} {{ $header := resources.Get "scss/header.scss" | resources.ToCSS }} {{ $banner := resources.Get "scss/banner.scss" | resources.ToCSS }} {{ $index := resources.Get "scss/index.scss" | resources.ToCSS }} @@ -15,7 +16,7 @@ {{ $pagination := resources.Get "scss/pagination.scss" | resources.ToCSS }} {{ $footer := resources.Get "scss/footer.scss" | resources.ToCSS }} {{ $generator := resources.Get "scss/generator.scss" | resources.ToCSS }} -{{ $allcss := slice $water $font $container $header $banner $index $gen_list $main $article $pagination $footer $generator | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }} +{{ $allcss := slice $water $font $init $container $header $banner $index $gen_list $main $article $pagination $footer $generator | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }}