Skip to content

Commit

Permalink
weitere anpassungen StudioWanner
Browse files Browse the repository at this point in the history
  • Loading branch information
fintinc committed Oct 8, 2024
1 parent 4faa2d0 commit f478ff9
Show file tree
Hide file tree
Showing 13 changed files with 60 additions and 31 deletions.
10 changes: 5 additions & 5 deletions site/assets/js/utils/slideshows.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,13 @@ export default function() {
}
}
});


let lastSlide = 3;

flkty.on( 'change', function( index ) {


const lastSlide = window.innerWidth > 1200 ? 2 : (window.innerWidth > 768 ? 2 : 1);
lastSlide = window.innerWidth > 1500 ? 3 : (window.innerWidth > 1200 ? 2 : (window.innerWidth > 768 ? 2 : 1));

console.log(flkty.cells.length,lastSlide,flkty.selectedIndex);
console.log(flkty.cells.length - lastSlide,flkty.selectedIndex);
Expand All @@ -83,12 +84,11 @@ export default function() {
}
});

/*
flkty.on( 'staticClick', function( event, pointer ) {
var pWidth = this.element.clientWidth;
var x = pointer.pageX - this.element.offsetLeft;
const lastSlide = window.innerWidth > 1200 ? 2 : (window.innerWidth > 768 ? 2 : 1);

if(pWidth/2 > x) {
flkty.selectedIndex == 0 ? flkty.select( flkty.cells.length - lastSlide ) : flkty.previous();
Expand All @@ -97,7 +97,7 @@ export default function() {
}
});

*/


}
Expand Down
22 changes: 16 additions & 6 deletions site/assets/scss/common/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@
--primary: #074761;
--primary-medium: #C1D1D7;
--primary-light: #e7ecee;
--body-padding-top: 7.4rem;
--body-padding-top: 10.6rem;
scroll-behavior: auto !important;

@include media-breakpoint-up(md) {
--body-padding-top: 20rem;
--body-padding-top: 20rem;
}

&:has(.home) {
--body-padding-top: 7.2rem;
scroll-behavior: smooth !important;

&:has(.home) {
--body-padding-top: 12rem;
scroll-behavior: smooth !important;
@include media-breakpoint-up(md) {
--body-padding-top: 12rem;
}
}
}
Expand Down Expand Up @@ -139,6 +143,12 @@ h1,
}
}

@include media-breakpoint-down(md) {
&.md {
font-size: 3.2rem;
}
}

@include media-breakpoint-up(md) {
font-size: 4.8rem;
}
Expand Down Expand Up @@ -432,7 +442,7 @@ a {
padding-bottom: 56.25%;
padding-top: 0;
height: 0;
overflow: hidden;
//overflow: hidden;
}

.video-container iframe,
Expand Down
3 changes: 2 additions & 1 deletion site/assets/scss/common/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ $green: $AC-Green;
$brown: #93795a;
$white: #fff;

$gray-100: #c0c0c0; // #dfe2e5; ??
$gray: #c0c0c0; // #dfe2e5; ??
$gray-dark: $dunkelgrau;
$gray-darker: #586069;
$gray: #dfe2e5;
$gray-200: #f6f8fa;
$gray-light: #fafbfc;
$blue-dark: #038;
Expand Down
18 changes: 13 additions & 5 deletions site/assets/scss/components/_flickity.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,16 @@
color: #fff;
mix-blend-mode: difference;
transition: all 0.2s ease;
border: 1px solid var(--bs-gray-100);

path {
fill: #fff;
transition: all 0.2s ease;
}
path {
fill: #fff;
fill: var(--bs-gray-100);
transition: all 0.2s ease;
}

&:hover {
background: #fff;
//border-color: #fff;

path {
fill: #000;
Expand All @@ -93,6 +91,16 @@
}
}

.flickity-prev-next-button {
&.previous {
left: 2rem;
}

&.next {
right: 2rem;
}
}

.entry-content {
.carousel {
margin-bottom: 0.5rem;
Expand Down
2 changes: 1 addition & 1 deletion site/assets/scss/layouts/_stories.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

svg {
width: 100%;
height: 100%;
max-height: 100%;
object-fit: contain;

path {
Expand Down
6 changes: 6 additions & 0 deletions site/assets/scss/layouts/_trainings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@
}
}

.costs,
.duration {
.nowrap {
margin-top: 5px;
}
}

// Filter

Expand Down
2 changes: 1 addition & 1 deletion site/content/de/stories/story2.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ lead: "Lead-/Einleitungstext Lorem ipsum dolor sit amet, consetetur sadipscing e
partner:
enable: true
title: "Unser Partner"
logo: "images/stories/baloise.png"
logo: "images/stories/baloise.svg"
link: "?"


Expand Down
5 changes: 5 additions & 0 deletions site/hugo_stats.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@
"entry-content",
"erg%C3%A4nzende-trainings",
"error404",
"extra-",
"extra-light",
"fade",
"faq",
Expand Down Expand Up @@ -295,6 +296,7 @@
"mb-md-0",
"mb-md-6",
"mc-field-group",
"md",
"me-1",
"me-10",
"me-2",
Expand Down Expand Up @@ -329,8 +331,11 @@
"ms-md-3",
"ms-md-4",
"ms-md-auto",
"mt-1",
"mt-10",
"mt-2",
"mt-20",
"mt-3",
"mt-4",
"mt-8",
"mt-auto",
Expand Down
8 changes: 4 additions & 4 deletions site/layouts/partials/box-training-small.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ <h3 class="h2 mb-8">{{ .Title }}</h3>
</div>

<div class="d-flex mt-auto">
<div class="duration small bold me-6 ">
<div class="duration d-flex small bold me-6 ">
{{ if .Params.duration }}
<svg class="icon icon-sm img-fluid flex-shrink-0" width="64" height="64" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg"><g fill="#000" fill-rule="nonzero"><path d="M30 19v15h15v-4H34V19z"/><path d="M32 7C18.193 7 7 18.193 7 32s11.193 25 25 25c.67 0 1.34 0 2-.09V48h-4v4.9c-10.768-1.017-19.002-10.046-19.026-20.862-.023-10.816 8.173-19.88 18.937-20.943 10.763-1.063 20.574 6.223 22.667 16.835C54.67 38.54 48.36 49.007 38 52.11v4.16c12.27-3.032 20.347-14.745 18.82-27.292C55.29 16.43 44.64 6.998 32 7z"/></g></svg>
<svg class="icon icon-sm img-fluid flex-shrink-0 me-1" width="64" height="64" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg"><g fill="#000" fill-rule="nonzero"><path d="M30 19v15h15v-4H34V19z"/><path d="M32 7C18.193 7 7 18.193 7 32s11.193 25 25 25c.67 0 1.34 0 2-.09V48h-4v4.9c-10.768-1.017-19.002-10.046-19.026-20.862-.023-10.816 8.173-19.88 18.937-20.943 10.763-1.063 20.574 6.223 22.667 16.835C54.67 38.54 48.36 49.007 38 52.11v4.16c12.27-3.032 20.347-14.745 18.82-27.292C55.29 16.43 44.64 6.998 32 7z"/></g></svg>
<span class="nowrap">{{ .Params.duration }}</span>
{{ end }}
</div>
<div class="costs small bold ">
<div class="costs d-flex small bold ">
{{ if .Params.costs }}
<svg class="icon icon-sm img-fluid flex-shrink-0" width="64" height="64" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="icon/Wallet" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="AC_Icon_Master_Pfade_AC_Icon_Wallet" transform="translate(6 7)" fill="#010101" fill-rule="nonzero"><path d="M48 16H36.08a10.73 10.73 0 0 0 .9-4.09H48v-4H36.35A11 11 0 0 0 15.62 8H6a6 6 0 0 0-6 6v36h40v-4H4V19.65A6 6 0 0 0 6 20h42v26h-4v4h8V16h-4zM26 4.6a7 7 0 0 1 7 7 6.94 6.94 0 0 1-1.56 4.4H20.56A6.94 6.94 0 0 1 19 11.6a7 7 0 0 1 7-7zM4 14a2 2 0 0 1 2-2h9a10.86 10.86 0 0 0 .9 4H6a2 2 0 0 1-2-2z" id="Shape"/></g></g></svg>
<svg class="icon icon-sm img-fluid flex-shrink-0 me-1" width="64" height="64" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="icon/Wallet" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="AC_Icon_Master_Pfade_AC_Icon_Wallet" transform="translate(6 7)" fill="#010101" fill-rule="nonzero"><path d="M48 16H36.08a10.73 10.73 0 0 0 .9-4.09H48v-4H36.35A11 11 0 0 0 15.62 8H6a6 6 0 0 0-6 6v36h40v-4H4V19.65A6 6 0 0 0 6 20h42v26h-4v4h8V16h-4zM26 4.6a7 7 0 0 1 7 7 6.94 6.94 0 0 1-1.56 4.4H20.56A6.94 6.94 0 0 1 19 11.6a7 7 0 0 1 7-7zM4 14a2 2 0 0 1 2-2h9a10.86 10.86 0 0 0 .9 4H6a2 2 0 0 1-2-2z" id="Shape"/></g></g></svg>
<span class="nowrap">{{ .Params.costs }}</span>
{{ end }}
</div>
Expand Down
8 changes: 4 additions & 4 deletions site/layouts/partials/box-training.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ <h3 class="h2 mb-5 mb-lg-18">{{ .Title }}</h3>
<p class="small mb-4 mb-lg-8">{{ .Params.abstract }}</p>

<div class="d-flex mt-auto">
<div class="duration small bold me-6 ">
<div class="duration d-flex small bold me-6 ">
{{ if .Params.duration }}
<svg class="icon icon-sm img-fluid flex-shrink-0" width="64" height="64" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg"><g fill="#000" fill-rule="nonzero"><path d="M30 19v15h15v-4H34V19z"/><path d="M32 7C18.193 7 7 18.193 7 32s11.193 25 25 25c.67 0 1.34 0 2-.09V48h-4v4.9c-10.768-1.017-19.002-10.046-19.026-20.862-.023-10.816 8.173-19.88 18.937-20.943 10.763-1.063 20.574 6.223 22.667 16.835C54.67 38.54 48.36 49.007 38 52.11v4.16c12.27-3.032 20.347-14.745 18.82-27.292C55.29 16.43 44.64 6.998 32 7z"/></g></svg>
<svg class="icon icon-sm img-fluid flex-shrink-0 me-1" width="64" height="64" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg"><g fill="#000" fill-rule="nonzero"><path d="M30 19v15h15v-4H34V19z"/><path d="M32 7C18.193 7 7 18.193 7 32s11.193 25 25 25c.67 0 1.34 0 2-.09V48h-4v4.9c-10.768-1.017-19.002-10.046-19.026-20.862-.023-10.816 8.173-19.88 18.937-20.943 10.763-1.063 20.574 6.223 22.667 16.835C54.67 38.54 48.36 49.007 38 52.11v4.16c12.27-3.032 20.347-14.745 18.82-27.292C55.29 16.43 44.64 6.998 32 7z"/></g></svg>
<span class="nowrap">{{ .Params.duration }}</span>
{{ end }}
</div>
<div class="costs small bold ">
<div class="costs d-flex small bold ">
{{ if .Params.costs }}
<svg class="icon icon-sm img-fluid flex-shrink-0" width="64" height="64" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="icon/Wallet" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="AC_Icon_Master_Pfade_AC_Icon_Wallet" transform="translate(6 7)" fill="#010101" fill-rule="nonzero"><path d="M48 16H36.08a10.73 10.73 0 0 0 .9-4.09H48v-4H36.35A11 11 0 0 0 15.62 8H6a6 6 0 0 0-6 6v36h40v-4H4V19.65A6 6 0 0 0 6 20h42v26h-4v4h8V16h-4zM26 4.6a7 7 0 0 1 7 7 6.94 6.94 0 0 1-1.56 4.4H20.56A6.94 6.94 0 0 1 19 11.6a7 7 0 0 1 7-7zM4 14a2 2 0 0 1 2-2h9a10.86 10.86 0 0 0 .9 4H6a2 2 0 0 1-2-2z" id="Shape"/></g></g></svg>
<svg class="icon icon-sm img-fluid flex-shrink-0 me-1" width="64" height="64" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="icon/Wallet" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="AC_Icon_Master_Pfade_AC_Icon_Wallet" transform="translate(6 7)" fill="#010101" fill-rule="nonzero"><path d="M48 16H36.08a10.73 10.73 0 0 0 .9-4.09H48v-4H36.35A11 11 0 0 0 15.62 8H6a6 6 0 0 0-6 6v36h40v-4H4V19.65A6 6 0 0 0 6 20h42v26h-4v4h8V16h-4zM26 4.6a7 7 0 0 1 7 7 6.94 6.94 0 0 1-1.56 4.4H20.56A6.94 6.94 0 0 1 19 11.6a7 7 0 0 1 7-7zM4 14a2 2 0 0 1 2-2h9a10.86 10.86 0 0 0 .9 4H6a2 2 0 0 1-2-2z" id="Shape"/></g></g></svg>
<span class="nowrap">{{ .Params.costs }}</span>
{{ end }}
</div>
Expand Down
2 changes: 1 addition & 1 deletion site/layouts/partials/content-stories.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div data-scroll class="story-teaser position-relative mb-10 mb-lg-20 ">
<div class=" border extra-light p-4">
<div class=" border extra- light p-4">

{{ with .Params.main_image }}
<div class="mb-6 d-none d-md-block">
Expand Down
2 changes: 1 addition & 1 deletion site/layouts/partials/page-header.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="col-lg-7">
<h1 data-scroll_ class="h4 mb-2">{{ .title | markdownify }}</h1>
{{ with .lead }}
<div data-scroll_ class="h1 sm mb-0">{{ . | markdownify }}</div>
<div data-scroll_ class="h1 md mb-0">{{ . | markdownify }}</div>
{{ end }}
</div>
</div>
3 changes: 1 addition & 2 deletions site/layouts/trainings/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<div class="col-lg-6">
{{ with .Params.header }}
<h1 data-scroll_ class="h4 mb-2 mb-lg-3">{{ .title | markdownify }}</h1>
<div data-scroll_ class="h1 sm mb-0">{{ .lead | markdownify }}</div>

<div data-scroll_ class="h1 md mb-0">{{ .lead | markdownify }}</div>
{{ end }}
</div>

Expand Down

0 comments on commit f478ff9

Please sign in to comment.