diff --git a/site/assets/js/app.js b/site/assets/js/app.js index dcabd52..c7ee204 100644 --- a/site/assets/js/app.js +++ b/site/assets/js/app.js @@ -16,6 +16,7 @@ const swup = new Swup({ containers: ['#main', '#main-menu', '#top-menu' ], ignoreVisit: (url, { el } = {}) => el?.closest('.language-switcher') , //ignoreVisit: (url, { el } = {}) => el?.closest('[data-no-swup]') || el?.closest('#wpadminbar'), + native: true, plugins: [ new SwupBodyClassPlugin(), new SwupHeadPlugin({ persistAssets: true }), diff --git a/site/assets/js/views/on-every-page.js b/site/assets/js/views/on-every-page.js index 785c546..aa05a48 100644 --- a/site/assets/js/views/on-every-page.js +++ b/site/assets/js/views/on-every-page.js @@ -95,11 +95,11 @@ if (anmeldeToggler) { } - +/* document.querySelectorAll('video[autoplay]').forEach( video => { video.play(); }); - + */ const popoverTriggerList = document.querySelectorAll('[data-bs-toggle="popover"]'); diff --git a/site/assets/scss/common/_global.scss b/site/assets/scss/common/_global.scss index b5cf8af..c1bdd5f 100644 --- a/site/assets/scss/common/_global.scss +++ b/site/assets/scss/common/_global.scss @@ -7,9 +7,10 @@ @include media-breakpoint-up(md) { --body-padding-top: 20rem; - + &:has(.home) { --body-padding-top: 12rem; + scroll-behavior: smooth !important; } } } @@ -28,16 +29,15 @@ body { display: flex; flex-direction: column; - padding-top: var(--body-padding-top); - + color: $AC-Blue; color: var(--primary); - + @include media-breakpoint-up(lg) { font-size: 1.8rem; //padding-top: 23rem; } - + -moz-font-feature-settings: "ss01"; -webkit-font-feature-settings: "ss01"; font-feature-settings: "ss01"; @@ -45,6 +45,10 @@ body { -moz-osx-font-smoothing: grayscale; } +#main { + padding-top: var(--body-padding-top); + +} //icons .icon { @@ -223,7 +227,10 @@ h6, } } -.bold { +.bold, +b, +strong { + font-weight: normal; font-family: "TTFirsNeue-Medium", sans-serif; } diff --git a/site/assets/scss/common/_swup.scss b/site/assets/scss/common/_swup.scss index bd8f83b..00b33ff 100644 --- a/site/assets/scss/common/_swup.scss +++ b/site/assets/scss/common/_swup.scss @@ -1,9 +1,26 @@ -/* Define a transition duration during page visits */ html.is-changing .transition-fade { - transition: opacity 0.2s; + view-transition-name: main; +} +::view-transition-old(main) { + animation: fade 0.3s ease-in-out both; + //min-height: 100vh; +} +::view-transition-new(main) { + animation: fade 0.3s ease-in-out both reverse; +} +@keyframes fade { + from { opacity: 1; } + to { opacity: 0; } +} + + +/* Define a transition duration during page visits */ + +html.is-changing:not(.swup-native) .transition-fade { + transition: 0.25s opacity; opacity: 1; } /* Define the styles for the unloaded pages */ -html.is-animating .transition-fade { +html.is-animating:not(.swup-native) .transition-fade { opacity: 0; -} +} \ No newline at end of file diff --git a/site/assets/scss/components/_scroll-out.scss b/site/assets/scss/components/_scroll-out.scss index 107d177..d493d80 100644 --- a/site/assets/scss/components/_scroll-out.scss +++ b/site/assets/scss/components/_scroll-out.scss @@ -2,7 +2,7 @@ opacity: 0; transform: translateY(2rem); will-change: opacity, transform; - transition: opacity 0.5s cubic-bezier(0.215,0.61,0.355,1) 0.5s, transform 0.75s cubic-bezier(0.215,0.61,0.355,1) 0.5s; + transition: opacity 0.3s cubic-bezier(0.215,0.61,0.355,1) 0.2s, transform 0.75s cubic-bezier(0.215,0.61,0.355,1) 0.2s; /* &.accordion-item { diff --git a/site/hugo_stats.json b/site/hugo_stats.json index e44916e..43bd26a 100644 --- a/site/hugo_stats.json +++ b/site/hugo_stats.json @@ -68,6 +68,7 @@ ], "classes": [ "4", + "^col-lg-7", "about", "accordion", "accordion-body", @@ -374,6 +375,8 @@ "open-source", "openshift-operations", "optimized", + "order-lg-1", + "order-lg-3", "order-md-1", "outline", "overflow-hidden", @@ -468,6 +471,7 @@ "row-cols-md-2", "row-cols-md-3", "row-cols-sm-2", + "scroll-down", "scrollmove", "scrollmove_", "section", @@ -496,6 +500,7 @@ "testimonial-carousel", "text-center", "text-end", + "text-lg-end", "text-md-end", "text-white", "timeline-item", @@ -678,6 +683,7 @@ "signupModal", "signupModalLabel", "slack-bleib-mit-uns-in-kontakt", + "start", "team", "telefon", "top-menu", diff --git a/site/layouts/contact/list.html b/site/layouts/contact/list.html index c05a982..75d6e15 100644 --- a/site/layouts/contact/list.html +++ b/site/layouts/contact/list.html @@ -11,7 +11,7 @@
-
+
diff --git a/site/layouts/index.html b/site/layouts/index.html index 686824e..1a4ffb8 100644 --- a/site/layouts/index.html +++ b/site/layouts/index.html @@ -2,13 +2,19 @@ {{ $data := index .Site.Data .Site.Language.Lang }} {{ with $data.homepage.video }} -
+
-
-

{{ .title }}

+

{{ .title }}

{{ end }} @@ -17,7 +23,7 @@

+
{{ with .label }} {{ . }} @@ -94,7 +100,7 @@

{{ .title }}

-
+
{{ range .item }} {{ $title := .title }} {{ with resources.Get .logo }} diff --git a/site/layouts/partials/footer/footer.html b/site/layouts/partials/footer/footer.html index 1296aee..d288e68 100644 --- a/site/layouts/partials/footer/footer.html +++ b/site/layouts/partials/footer/footer.html @@ -43,10 +43,10 @@
{{ i18n "followUs" }}
{{ with site.Params.social }} - + - + {{ end }}
diff --git a/site/layouts/trainings/list.html b/site/layouts/trainings/list.html index 2b8a6b1..a1af0db 100644 --- a/site/layouts/trainings/list.html +++ b/site/layouts/trainings/list.html @@ -1,5 +1,7 @@ {{ define "main" }} +
+
@@ -10,13 +12,13 @@

{{ .title | markdownify }}

{{ end }}
-
+
{{ range .Params.imagecloud }} -
+
{{- partial "img" (dict "page" . "src" .img1 "width" 200 "process" "" ) }}
@@ -73,7 +75,6 @@

{{ .Params.filtertitle }}

-
{{ range .Data.Pages }} @@ -82,6 +83,8 @@

{{ .Params.filtertitle }}

+ +
{{ with .Params.zertifikate }}
@@ -155,7 +158,7 @@

{{ .title }}

diff --git a/site/layouts/trainings/single.html b/site/layouts/trainings/single.html index e6101b3..4fd13bd 100644 --- a/site/layouts/trainings/single.html +++ b/site/layouts/trainings/single.html @@ -1,36 +1,29 @@ {{ define "main" }} + - - - - -
- -
+
-
- {{ .Title }} -
-
- {{ .Title }} -
-
- {{ .Title }} -
-
- {{ .Title }} -
+
{{ .Title }}
+
{{ .Title }}
+
{{ .Title }}
+
{{ .Title }}
-
+
-
+
+
Training
+

{{ .Title }}

+
+ + +
{{ if .Params.techlogo.full }} {{ with .Params.techlogo.full }} {{ with resources.Get . }} @@ -42,10 +35,19 @@ {{ end }}
-
-
Training
-

{{ .Title }}

+ {{ if .Params.kooperation.enable }} +
+
{{ .Params.kooperation.subtitle | safeHTML }}
+
+ {{ end }} + +
+ + +
+ +
{{ .Params.main_title | markdownify}}
{{ .Params.main_text | markdownify}} @@ -156,7 +158,7 @@

{{ .title | markdownify}}

{{ if .Params.kooperation.enable }} {{ with .Params.kooperation }} -
+

{{ .title | markdownify }}

@@ -179,10 +181,6 @@

{{ .title | markdownify }}

- {{ if .Params.kooperation.enable }} -
{{ .Params.kooperation.subtitle | safeHTML }}
- {{ end }} -
@@ -251,7 +249,7 @@

{{ .title | markdownify }}

-
+