From 93fb7f1b1a2055d74c8cf993781546e7349da4cd Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 29 Jul 2023 13:16:25 +0200 Subject: [PATCH] WIP --- assets/css/style.css | 8 +- layouts/404.html | 10 +- layouts/_default/list.html | 2 +- layouts/abiturienten/single.html | 2 +- layouts/anmeldeformular/list.html | 2 +- layouts/anmeldung/list.html | 4 +- layouts/author/single.html | 2 +- layouts/begabte/single.html | 2 +- layouts/cantorfora/list.html | 2 +- layouts/cantorpreis/single.html | 2 +- layouts/ganztagsangebote/single.html | 68 ++------ layouts/index.html | 28 +-- layouts/kontakt/list.html | 46 ++--- layouts/pages/single.html | 8 +- layouts/partials/authors.html | 4 +- layouts/partials/blog-sidebar.html | 34 ++-- .../partials/{card.html => card-article.html} | 2 +- layouts/partials/card-btn-ni.html | 9 - layouts/partials/card-btn.html | 10 +- layouts/partials/card-category.html | 6 +- layouts/partials/collapsible.html | 14 +- layouts/partials/download.html | 14 +- layouts/partials/filter-controls.html | 31 ++-- layouts/partials/footer.html | 24 +-- layouts/partials/ganztag.html | 8 +- layouts/partials/header-cl-url.html | 35 ---- layouts/partials/header-contest.html | 23 +++ layouts/partials/icon-element.html | 9 + layouts/partials/info.html | 4 +- layouts/partials/modal.html | 2 +- layouts/partials/termin.html | 22 ++- layouts/partials/tile-modals.html | 20 +-- layouts/projektwoche/list.html | 2 +- layouts/schulchronik/list.html | 4 +- layouts/schulchronik/single.html | 165 +++++++++--------- layouts/shortcodes/audio.html | 2 +- layouts/shortcodes/card.html | 10 +- layouts/wettbewerbe/list.html | 5 +- layouts/wettbewerbe/single.html | 10 +- 39 files changed, 274 insertions(+), 381 deletions(-) rename layouts/partials/{card.html => card-article.html} (93%) delete mode 100644 layouts/partials/card-btn-ni.html delete mode 100644 layouts/partials/header-cl-url.html create mode 100644 layouts/partials/header-contest.html create mode 100644 layouts/partials/icon-element.html diff --git a/assets/css/style.css b/assets/css/style.css index 9b709b1b..e14f34d8 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -537,7 +537,7 @@ details[open] summary { .intro-video .play-btn { position: absolute; top: 50%; - left: 0; + left: calc(50% - 40px); transform: translateY(-50%); } @@ -914,12 +914,6 @@ link:focus, } } -@media (min-width: 768px) { - .termin-tc { - width: 25%; - } -} - @media (max-width: 991px) { .navigation { background: var(--gcg-color-secondary); diff --git a/layouts/404.html b/layouts/404.html index 8d3ef15b..e26611cd 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -2,13 +2,9 @@
-
-
-
-

Hier geht es leider nicht weiter.

- Zurück zur Startseite -
-
+
+

Hier geht es leider nicht weiter.

+ Zurück zur Startseite
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index b2a001ca..27b9b674 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -8,7 +8,7 @@ {{ $paginator := .Paginate ( where .Data.Pages "Type" "post") }} {{ range $paginator.Pages }}
- {{ partial "card" . }} + {{ partial "card-article" . }}
{{ end }}
diff --git a/layouts/abiturienten/single.html b/layouts/abiturienten/single.html index c0b5af98..771c4a4b 100644 --- a/layouts/abiturienten/single.html +++ b/layouts/abiturienten/single.html @@ -3,7 +3,7 @@
-
+
{{ .Content }}
diff --git a/layouts/anmeldeformular/list.html b/layouts/anmeldeformular/list.html index c34d6b8c..dfafc53e 100644 --- a/layouts/anmeldeformular/list.html +++ b/layouts/anmeldeformular/list.html @@ -1,6 +1,6 @@ {{ define "main" }} -
+
diff --git a/layouts/anmeldung/list.html b/layouts/anmeldung/list.html index 25ea17f1..dbe29120 100644 --- a/layouts/anmeldung/list.html +++ b/layouts/anmeldung/list.html @@ -2,7 +2,7 @@
-
+
{{ .Content }}
@@ -11,7 +11,7 @@

{{ .title }}

-
{{ .content | markdownify }}
+
{{ .content | markdownify }}
diff --git a/layouts/author/single.html b/layouts/author/single.html index f6a27829..620871f7 100644 --- a/layouts/author/single.html +++ b/layouts/author/single.html @@ -27,7 +27,7 @@
{{ range where .Site.RegularPages "Params.author" "intersect" (slice .File.BaseFileName) }}
- {{ partial "card" . }} + {{ partial "card-article" . }}
{{ end }}
diff --git a/layouts/begabte/single.html b/layouts/begabte/single.html index 77fd36c5..d81be7c8 100644 --- a/layouts/begabte/single.html +++ b/layouts/begabte/single.html @@ -1,6 +1,6 @@ {{ define "main" }} -{{ partial "header-cl-url" . }} +{{ partial "header-contest" . }}
diff --git a/layouts/cantorfora/list.html b/layouts/cantorfora/list.html index 462c19b7..1d790896 100644 --- a/layouts/cantorfora/list.html +++ b/layouts/cantorfora/list.html @@ -2,7 +2,7 @@
-
+
{{ .Content }}
diff --git a/layouts/cantorpreis/single.html b/layouts/cantorpreis/single.html index 5fdf0301..5e00df8e 100644 --- a/layouts/cantorpreis/single.html +++ b/layouts/cantorpreis/single.html @@ -9,7 +9,7 @@

{{ .Params.Name }}

{{ .Title }}
-
+
{{ .Content }}
diff --git a/layouts/ganztagsangebote/single.html b/layouts/ganztagsangebote/single.html index 454e1793..b00918f6 100644 --- a/layouts/ganztagsangebote/single.html +++ b/layouts/ganztagsangebote/single.html @@ -2,72 +2,24 @@
-
-
- -
+ +

{{ .Title }}

+
+ {{ partial "icon-element" (dict "size" 3 "icon" "mdi-calendar-today-outline" "title" "Zeit" "content" .Params.schedule) }} + {{ partial "icon-element" (dict "size" 3 "icon" "mdi-timer-sand" "title" "Dauer" "content" .Params.duration) }} + {{ partial "icon-element" (dict "size" 3 "icon" "mdi-crowd" "title" "Klassen" "content" .Params.class) }} + {{ partial "icon-element" (dict "size" 3 "icon" "mdi-map-marker-radius-outline" "title" "Raum" "content" .Params.room) }}
-

{{ .Title }}

-
-
-
-
-
- -
-
Zeit
-

{{ .Params.schedule }}

-
-
-
-
-
- -
-
Dauer
-

{{ .Params.duration }}

-
-
-
-
-
- -
-
Klassen
-

{{ .Params.class }}

-
-
-
-
-
- -
-
Raum
-

{{ .Params.room }}

-
-
-
-
-
-
-
-
-
-
-
+
+
{{ .Content }} -
-
-
-

Andere Arbeitsgemeinschaften

-
-
+

Andere Arbeitsgemeinschaften

{{ range partial "related" . }}
diff --git a/layouts/index.html b/layouts/index.html index 11db97f4..b3c3617d 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -6,20 +6,20 @@ {{ with $data.homepage.slider }}
-
-
-

{{ $data.homepage.slider.title | markdownify }}

-
- {{ range .slider_item }} -
-

{{ .content | markdownify }}

- {{ if .button.enable }} - {{ .button.label }} - {{ end }} -
+
+
+

{{ $data.homepage.slider.title | markdownify }}

+
+ {{ range .slider_item }} +
+

{{ .content | markdownify }}

+ {{ if .button.enable }} + {{ .button.label }} {{ end }} -
+ {{ end }} +
+
@@ -73,7 +73,7 @@

{{ .title | markdownify }}

-
+
{{ .content | markdownify }}
{{ if .button.enable }} @@ -139,7 +139,7 @@ {{ end }} {{ range first (cond $data.ausblick.enable (int $data.homepage.blog.number) (add $data.homepage.blog.number 1)) (where .Site.RegularPages "Type" "post")}}
- {{ partial "card" . }} + {{ partial "card-article" . }}
{{ end }}
diff --git a/layouts/kontakt/list.html b/layouts/kontakt/list.html index 4d1844ae..3ab7b970 100644 --- a/layouts/kontakt/list.html +++ b/layouts/kontakt/list.html @@ -1,14 +1,10 @@ {{ define "main" }} - + - + -
+
@@ -48,30 +44,22 @@ crossorigin=""/>
-
-
-
-
-
- -
-
-
-
-
+ map.on('click', (e) => { + marker.bindPopup('Georg-Cantor-Gymnasium
Torstraße 13
06110 Halle (Saale)
Route').openPopup(); + }); + +
{{ end }} diff --git a/layouts/pages/single.html b/layouts/pages/single.html index 996f630f..289b95ab 100644 --- a/layouts/pages/single.html +++ b/layouts/pages/single.html @@ -2,12 +2,8 @@
-
-
-
- {{ .Content | safeHTML }} -
-
+
+ {{ .Content }}
diff --git a/layouts/partials/authors.html b/layouts/partials/authors.html index df404707..9f1c9f22 100644 --- a/layouts/partials/authors.html +++ b/layouts/partials/authors.html @@ -1,8 +1,8 @@ {{ range $index, $elements := where (where .Site.RegularPages "Type" "author") "File.BaseFileName" "in" .author }} {{ if ne $index 0 }}, {{ end }} {{ if .Params.simplified }} - {{ .Title }} + {{ .Title }} {{ else }} - {{ .Title }} + {{ .Title }} {{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/partials/blog-sidebar.html b/layouts/partials/blog-sidebar.html index 26487cbd..c3a026b0 100644 --- a/layouts/partials/blog-sidebar.html +++ b/layouts/partials/blog-sidebar.html @@ -1,37 +1,37 @@