Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3rd color #32

Merged
merged 1 commit into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion site/assets/js/utils/slideshows.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export default function() {

// cotinuous ticker:
const _updateTicker = function() {
flkty_clients.x = (flkty_clients.x - 0.5) % flkty_clients.slideableWidth;
flkty_clients.x = (flkty_clients.x - 0.85) % flkty_clients.slideableWidth;
flkty_clients.selectedIndex = flkty_clients.dragEndRestingSelect();
flkty_clients.updateSelectedSlide();
flkty_clients.settle(flkty_clients.x);
Expand Down
15 changes: 11 additions & 4 deletions site/assets/js/views/on-every-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,22 @@ export default function() {
"54 115 92", //#36735c //AC-Green
"208 143 76", //#F6E8DB", //AC-Yellow
];
const colors_medium = [
"193 209 215", //AC-Blue - light
"232 212 223", //AC-Red - light
"230 237 234", //AC-Green - light
"246 232 219", //AC-Yellow - light
];
const colors_light = [
"230 236 238", //"#E6ECEE", //AC-Blue
"232 212 223", //"#E8D4DF", //AC-Red
"230 237 234", //"#E6EDEA", //AC-Green
"246 232 219", //"#F6E8DB", //AC-Yellow
"230 236 238", //AC-Blue - light
"232 212 223", //AC-Red - light
"230 237 234", //AC-Green - light
"246 232 219", //AC-Yellow - light
];
let randomColor = Math.floor(Math.random() * colors.length);

root.style.setProperty('--primary', 'rgb('+colors[randomColor]+')');
root.style.setProperty('--primary-medium', 'rgb('+colors_medium[randomColor]+')');
root.style.setProperty('--primary-light', 'rgb('+colors_light[randomColor]+')');
//root.style.setProperty('--color', colors[randomColor]);
root.style.setProperty('--shadowColor', 'rgba('+colors[randomColor].split(' ').join(',')+', 0.3)');
Expand Down
10 changes: 6 additions & 4 deletions site/assets/scss/common/_global.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
:root {
--primary: #074761;
--primary-medium: #C1D1D7;
--primary-light: #e7ecee;
--body-padding-top: 12rem;
scroll-behavior: auto !important;
Expand Down Expand Up @@ -264,7 +265,7 @@ a {
border-color: var(--primary) !important;

&.light {
border-color: var(--primary-light) !important;
border-color: var(--primary-medium) !important;
transition: border-color 0.2s ease;

&:hover {
Expand Down Expand Up @@ -383,16 +384,17 @@ a {

.entry-content {
ol, ul, dl {
padding-left: 1.6rem;
padding-left: 0;
}

li {
list-style: none;
line-height: 1.7;
padding-left: 1em;

&::before {
content: "– ";
margin-left: -0.75rem;
margin-left: -1em;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion site/assets/scss/components/_animations.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
transform: translateX(0);
}
100% {
transform: translateX(-300%);
transform: translateX(-10vh);
}
}

Expand Down
17 changes: 12 additions & 5 deletions site/assets/scss/components/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -80,33 +80,40 @@
width: 22px;
height: 22px;
}

position: relative;

&::before {
content: "";
height: 100%;
width: 1px;
width: 2px;
background: var(--primary);
display: block;
top: 0;
left: 50%;
position: absolute;
transform: translateX(-50%);

transition: all 0.2s ease;

[aria-expanded="true"] & {
height: 0;
background: var(--primary-light);
transform: translateX(-50%) scaleY(0);
}
}
&::after {
content: "";
height: 1px;
height: 2px;
width: 100%;
background: var(--primary);
display: block;
top: 50%;
left: 0;
position: absolute;
transform: translateY(-50%);
transition: all 0.2s ease;

[aria-expanded="true"] & {
background: var(--primary-light);
}
}

.box-anmelden [aria-expanded="true"] & {
Expand Down
2 changes: 1 addition & 1 deletion site/assets/scss/layouts/_home.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

.hero-video {
.video-container {
height: calc(100dvh - var(--body-padding-top) - 2rem);
height: calc(100dvh - var(--body-padding-top) );
}
}

Expand Down
16 changes: 5 additions & 11 deletions site/hugo_stats.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
"accordion-flush",
"accordion-header",
"accordion-item",
"accordion-title",
"accordion-title_",
"active",
"additional-trainings",
Expand Down Expand Up @@ -193,6 +192,7 @@
"flex-md-shrink-0",
"flex-nowrap",
"flex-shrink-0",
"flex-shrink-0me-2",
"flickity-button",
"flickity-prev-next-button",
"footer-banner",
Expand Down Expand Up @@ -233,6 +233,7 @@
"img-container",
"img-container_",
"img-fluid",
"img-fluidme-2",
"impressum",
"info-box",
"inherit",
Expand Down Expand Up @@ -282,7 +283,6 @@
"mb-lg-32",
"mb-lg-32_",
"mb-lg-4",
"mb-lg-5",
"mb-lg-6",
"mb-lg-8",
"mb-md-6",
Expand All @@ -298,8 +298,8 @@
"me-auto",
"me-lg-0",
"me-lg-12",
"me-lg-4",
"me-lg-48",
"me-lg-6",
"me-md-0",
"me-md-5",
"memberships",
Expand All @@ -318,15 +318,13 @@
"ms-lg-5",
"ms-md-3",
"ms-md-4",
"ms-md-5",
"ms-md-auto",
"mt-1",
"mt-10",
"mt-2",
"mt-20",
"mt-3",
"mt-4",
"mt-6",
"mt-8",
"mt-auto",
"mt-lg-6",
Expand All @@ -339,7 +337,6 @@
"my-13",
"my-2",
"my-5",
"my-6",
"my-8",
"my-auto",
"my-lg-16",
Expand Down Expand Up @@ -372,7 +369,6 @@
"p-0",
"p-3_",
"p-4",
"p-lg-16",
"p-lg-8",
"partner-carousel",
"pattern",
Expand All @@ -384,7 +380,6 @@
"pb-5",
"pb-6",
"pb-lg-54",
"pe-5",
"pe-lg-16",
"pe-md-1",
"pe-md-3",
Expand All @@ -398,9 +393,10 @@
"privacy",
"programming",
"prometheus",
"ps-4",
"ps-10",
"ps-lg-0",
"ps-lg-10",
"ps-lg-16",
"ps-lg-3",
"ps-lg-6",
"ps-lg-8",
Expand All @@ -424,7 +420,6 @@
"px-6",
"px-lg-0",
"px-lg-10",
"px-lg-16",
"px-lg-20",
"px-lg-6",
"px-lg-8",
Expand All @@ -437,7 +432,6 @@
"py-2",
"py-3",
"py-5",
"py-6",
"py-8",
"py-lg-16",
"py-lg-32",
Expand Down
2 changes: 1 addition & 1 deletion site/layouts/partials/content-journal.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h2 class="h3 mb-6">{{ .Title }}</h2>
{{ end }}
{{ end }}

<a class="stretched-link ms-auto mt-lg-auto" href="{{ .Permalink | safeURL }}">
<a class="stretched-link bold ms-auto mt-lg-auto" href="{{ .Permalink | safeURL }}">
{{ i18n "continueReading" }}
</a>
</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
Expand Up @@ -11,7 +11,7 @@
<div class="col-lg-5">

{{ with .Params.person }}
<div class="mb-2">
<div class="mb-2 small">
<div class="bold"> {{ .name }}</div>
{{ .title }}
</div>
Expand Down
2 changes: 1 addition & 1 deletion site/layouts/partials/content-story-testimonial.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<p class="quote">«{{ .Params.person.quote | markdownify }}»</p>

<a class="stretched-link_" href="{{ .Permalink | safeURL }}">
<a class="stretched-link_ link-border" href="{{ .Permalink | safeURL }}">
{{ i18n "continueReading" }}
</a>

Expand Down
Loading
Loading