From 06fbf0e1fa7e8b941d4f513df1d3b705be226f2d Mon Sep 17 00:00:00 2001 From: FlorianEisenmenger Date: Tue, 16 Jun 2026 13:28:35 +0200 Subject: [PATCH] bugfixing --- gfi-ihk-2024/stories/_global/styles/main.scss | 2 +- .../_global/styles/storybook-preview.scss | 1 + .../stories/atoms/badge/BadgeComponent.js | 2 +- gfi-ihk-2024/stories/components/a-z/a-z.scss | 30 +++++++++++++++++-- .../accordion/AccordionComponent.js | 6 ++-- .../components/accordion/accordion.scss | 11 +------ .../election-form/ElectionFormComponent.js | 2 +- .../stories/components/gallery/gallery.scss | 8 +++++ .../stories/components/infobox/infobox.scss | 4 +++ .../stories/components/linklist/linklist.scss | 1 + gfi-ihk-2024/stories/components/nav/nav.scss | 3 +- .../components/search-form/search-form.scss | 4 +++ .../SuperlistEntryComponent.js | 2 +- .../superlist-entry/superlist-entry.scss | 4 +-- .../stories/components/teaser/teaser.scss | 2 +- .../sections/quick-facts/quick-facts.scss | 2 +- .../stories/sections/teasers/teasers.scss | 4 +-- 17 files changed, 61 insertions(+), 27 deletions(-) diff --git a/gfi-ihk-2024/stories/_global/styles/main.scss b/gfi-ihk-2024/stories/_global/styles/main.scss index 0c2a90a..2f738a3 100644 --- a/gfi-ihk-2024/stories/_global/styles/main.scss +++ b/gfi-ihk-2024/stories/_global/styles/main.scss @@ -13,7 +13,7 @@ --theme-color-secondary: #56BD66; --theme-color-secondary-microsite: var(--theme-color-secondary); - --swatches-secondary-700: #247929; + --theme-color-secondary-intensed: #247929; --theme-color-secondary-dimmed: #E4F1E4; --theme-color-gradient-01: var(--theme-color-primary); diff --git a/gfi-ihk-2024/stories/_global/styles/storybook-preview.scss b/gfi-ihk-2024/stories/_global/styles/storybook-preview.scss index 1eea857..c127cd2 100644 --- a/gfi-ihk-2024/stories/_global/styles/storybook-preview.scss +++ b/gfi-ihk-2024/stories/_global/styles/storybook-preview.scss @@ -93,6 +93,7 @@ .sb-main-padded.sb-show-main > #root > .a-z { max-width: 880px; + margin-top: var(--section-margin); .letters { top: 0; diff --git a/gfi-ihk-2024/stories/atoms/badge/BadgeComponent.js b/gfi-ihk-2024/stories/atoms/badge/BadgeComponent.js index 459fb6a..179d314 100644 --- a/gfi-ihk-2024/stories/atoms/badge/BadgeComponent.js +++ b/gfi-ihk-2024/stories/atoms/badge/BadgeComponent.js @@ -4,5 +4,5 @@ import {createElement} from "../../_global/scripts/helpers"; export const createBadge = ({ count = 8, }) => { - return createElement('span', ['badge', 'variant-base'], count.toString()); + return createElement('span', ['badge'], count.toString()); } \ No newline at end of file diff --git a/gfi-ihk-2024/stories/components/a-z/a-z.scss b/gfi-ihk-2024/stories/components/a-z/a-z.scss index 8cf42df..826ee52 100644 --- a/gfi-ihk-2024/stories/components/a-z/a-z.scss +++ b/gfi-ihk-2024/stories/components/a-z/a-z.scss @@ -1,5 +1,6 @@ @use '../../_global/styles/mixins' as *; @use '../../_global/styles/vars' as *; +@use '../linklist/linklist'; h1 + .a-z { margin-top: 30px; @@ -18,7 +19,7 @@ h1 + .a-z { flex-wrap: wrap; overflow: hidden; margin: 0 0 0 -2px; - padding: 10px 0 0; + padding: 10px 0 20px; z-index: 2; box-shadow: 0 -2px 0 0 var(--color-background); @@ -167,13 +168,36 @@ h1 + .a-z { .accordion-content .contact-wrapper { margin: 0; } + .accordion { + > .linklist { + margin-top: 0; + + > li:first-child { + border-top: 0; + } + } + } } } -.a-z{ - .faq-heading{ +.a-z { + .faq-heading { margin-top: 10px !important; } + + .outer.accordion { + margin: 0; + + > .linklist, + > ul { + border-bottom: none; + + > li { + padding-left: var(--linklist-icon-padding); + border-top: none; + } + } + } } .a-z-list{ .responsiveContainer { diff --git a/gfi-ihk-2024/stories/components/accordion/AccordionComponent.js b/gfi-ihk-2024/stories/components/accordion/AccordionComponent.js index 1823d99..d79c653 100644 --- a/gfi-ihk-2024/stories/components/accordion/AccordionComponent.js +++ b/gfi-ihk-2024/stories/components/accordion/AccordionComponent.js @@ -22,7 +22,7 @@ export const createAccordion = if (type === 'regular') { items.map((item) => { const li = createElement('li', [], null, ul); - const a = createElement('a', ['accordion-toggler','variant-subtle-primary-hover'], item.title, li); + const a = createElement('a', ['accordion-toggler','variant-subtle-secondary-hover'], item.title, li); const content = createElement('div', ['accordion-content'], item.content, li); // a.href = '#' + item.id; @@ -41,8 +41,8 @@ export const createAccordion = if (type === 'event') { items.map((item, index) => { const li = createElement('li', [], null, ul); - const toggler = createElement('a', ['accordion-toggler','variant-subtle-primary-hover'], null, li); - const content = createElement('div', ['accordion-content','variant-subtle-primary'], null, li); + const toggler = createElement('a', ['accordion-toggler','variant-subtle-secondary-hover'], null, li); + const content = createElement('div', ['accordion-content','variant-subtle-secondary'], null, li); toggler.href = '#js-event-' + index; content.id = 'js-event-' + index; diff --git a/gfi-ihk-2024/stories/components/accordion/accordion.scss b/gfi-ihk-2024/stories/components/accordion/accordion.scss index 4725f38..22c00af 100644 --- a/gfi-ihk-2024/stories/components/accordion/accordion.scss +++ b/gfi-ihk-2024/stories/components/accordion/accordion.scss @@ -31,6 +31,7 @@ > li { padding-left: var(--accordion-icon-width); border-top: 1px solid var(--color-surface-inset); + margin-bottom: 0; } > li.inAccordion { @@ -387,16 +388,6 @@ margin-top: 2px; list-style-type: none; } - - .accordion { - > .linklist { - margin-top: 0; - - > li:first-child { - border-top: 0; - } - } - } } .accordion>.linklist>li.inAccordion.open .accordion-toggler:before, .accordion>ul>li.inAccordion.open .accordion-toggler:before { diff --git a/gfi-ihk-2024/stories/components/election-form/ElectionFormComponent.js b/gfi-ihk-2024/stories/components/election-form/ElectionFormComponent.js index c68f82f..884f152 100644 --- a/gfi-ihk-2024/stories/components/election-form/ElectionFormComponent.js +++ b/gfi-ihk-2024/stories/components/election-form/ElectionFormComponent.js @@ -17,7 +17,7 @@ export const createElectionForm = const electionForm = createElement('div', ['election-form', 'variant-solid'], null, null, inlineStyles); createElement('h2', [], title, electionForm); - const form = createElement('form', ['election-form--form'], null, electionForm); + const form = createElement('form', ['election-form--form','variant-base'], null, electionForm); const selectWrapper = createElement('div', ['input-wrapper'], null, form); selectWrapper.appendChild(createInputSelect({ placeholder: placeholderElectionGroup, diff --git a/gfi-ihk-2024/stories/components/gallery/gallery.scss b/gfi-ihk-2024/stories/components/gallery/gallery.scss index 97c103e..407a03b 100644 --- a/gfi-ihk-2024/stories/components/gallery/gallery.scss +++ b/gfi-ihk-2024/stories/components/gallery/gallery.scss @@ -91,6 +91,14 @@ @include copyright; opacity: 1 !important; } + + .btn { + background-color: var(--color-button-tertiary-background); + color: var(--color-button-tertiary-text); + &:after { + box-shadow: 0 0 0 var(--button-hover-shadow-size) var(--color-button-tertiary-background); + } + } } &[data-type="grid"] { diff --git a/gfi-ihk-2024/stories/components/infobox/infobox.scss b/gfi-ihk-2024/stories/components/infobox/infobox.scss index 486dea7..1aba17b 100644 --- a/gfi-ihk-2024/stories/components/infobox/infobox.scss +++ b/gfi-ihk-2024/stories/components/infobox/infobox.scss @@ -72,6 +72,10 @@ article.col div.strong { } .infobox--content { flex: 1; + > .btn { + background: var(--color-button-secondary-background); + color: var(--color-button-secondary-text); + } } .icon-box { flex-shrink: 0; diff --git a/gfi-ihk-2024/stories/components/linklist/linklist.scss b/gfi-ihk-2024/stories/components/linklist/linklist.scss index 4fba7e8..1b3e421 100644 --- a/gfi-ihk-2024/stories/components/linklist/linklist.scss +++ b/gfi-ihk-2024/stories/components/linklist/linklist.scss @@ -66,6 +66,7 @@ left: calc(var(--linklist-focus-padding) * 0.5); transform: translate3d(0, 0, 0); text-decoration: underline; + color: var(--color-decoration); } &:before { diff --git a/gfi-ihk-2024/stories/components/nav/nav.scss b/gfi-ihk-2024/stories/components/nav/nav.scss index 37a3a72..a515038 100644 --- a/gfi-ihk-2024/stories/components/nav/nav.scss +++ b/gfi-ihk-2024/stories/components/nav/nav.scss @@ -336,7 +336,8 @@ .secondary { position: relative; z-index: 1; - background-color: var(--swatches-primary-100); + background-color: var(--color-button-secondary-background); + color: var(--color-button-secondary-text); text-align: left; ul { diff --git a/gfi-ihk-2024/stories/components/search-form/search-form.scss b/gfi-ihk-2024/stories/components/search-form/search-form.scss index a824308..4841ca1 100644 --- a/gfi-ihk-2024/stories/components/search-form/search-form.scss +++ b/gfi-ihk-2024/stories/components/search-form/search-form.scss @@ -34,6 +34,10 @@ .toggle-actions { padding: 30px 0; + .btn { + background: var(--color-button-tertiary-background); + color: var(--color-button-tertiary-text) + } .btn.open::before { @include icon-minus; diff --git a/gfi-ihk-2024/stories/components/superlist-entry/SuperlistEntryComponent.js b/gfi-ihk-2024/stories/components/superlist-entry/SuperlistEntryComponent.js index 28647dd..5136670 100644 --- a/gfi-ihk-2024/stories/components/superlist-entry/SuperlistEntryComponent.js +++ b/gfi-ihk-2024/stories/components/superlist-entry/SuperlistEntryComponent.js @@ -24,7 +24,7 @@ export const createSuperlistEntrySection = ({ onlyForStorybook.appendChild(section); } - const graphic = createElement('div', ['graphic','variant-solid'], null, section); + const graphic = createElement('div', ['graphic', centered ? 'variant-accent' : 'variant-solid'], null, section); createElement('div', ['icon-box', icon], null, graphic); const container = createElement('div', ['textbox'], null, section); createElement('h3', [], headline, container); diff --git a/gfi-ihk-2024/stories/components/superlist-entry/superlist-entry.scss b/gfi-ihk-2024/stories/components/superlist-entry/superlist-entry.scss index d67522d..3b219d9 100644 --- a/gfi-ihk-2024/stories/components/superlist-entry/superlist-entry.scss +++ b/gfi-ihk-2024/stories/components/superlist-entry/superlist-entry.scss @@ -145,13 +145,13 @@ position: absolute; left: 0; top: 0; - background: var(--color-decoration); + background: var(--color-background); @media (min-width: 768px) { left: 50%; transform: translate(-50%, 0); } .icon-box { - color: var(--color-background); + color: var(--color-text); } } .textbox { diff --git a/gfi-ihk-2024/stories/components/teaser/teaser.scss b/gfi-ihk-2024/stories/components/teaser/teaser.scss index bbdf0aa..250397c 100644 --- a/gfi-ihk-2024/stories/components/teaser/teaser.scss +++ b/gfi-ihk-2024/stories/components/teaser/teaser.scss @@ -232,7 +232,7 @@ } [date-type='hero'], .teaser.hero, .teaser.pictoHero { - .image-box ~ .text-box { + .image-box ~ div.text-box { padding-top: 0.9em; .title { diff --git a/gfi-ihk-2024/stories/sections/quick-facts/quick-facts.scss b/gfi-ihk-2024/stories/sections/quick-facts/quick-facts.scss index c2075bf..bff89ac 100644 --- a/gfi-ihk-2024/stories/sections/quick-facts/quick-facts.scss +++ b/gfi-ihk-2024/stories/sections/quick-facts/quick-facts.scss @@ -45,7 +45,7 @@ position: absolute; width: 374px; height: 374px; - background-color: #9AD7A3; + background-color: var(--swatches-secondary-300); top: 50%; left: 50%; border-radius: 50%; diff --git a/gfi-ihk-2024/stories/sections/teasers/teasers.scss b/gfi-ihk-2024/stories/sections/teasers/teasers.scss index b2c089f..17dda1d 100644 --- a/gfi-ihk-2024/stories/sections/teasers/teasers.scss +++ b/gfi-ihk-2024/stories/sections/teasers/teasers.scss @@ -480,7 +480,7 @@ bottom: 8px; } - img { + :not(.icon) > img { position: absolute; display: block; top: 0; @@ -499,7 +499,7 @@ position: relative; } - .image-box ~ .text-box { + .image-box ~ div.text-box { padding-top: 16px; h4, .like-h4 {