From 2ca8275135fd2e98d75d26340d7763e2aeeb6834 Mon Sep 17 00:00:00 2001 From: nanoparsec <1646402+nanoparsec@users.noreply.github.com> Date: Thu, 28 Jan 2021 22:30:21 +0100 Subject: [PATCH] Apripetrol (#78) Update styleguide to apripetrol theme --- .sass-lint.yml | 6 +- .../alert/_alert.scss | 12 +- .../alert/alert--error.html | 0 .../alert/alert--warn.html | 0 .../alert/alert.config.yml | 0 .../alert/alert.html | 0 .../button-group/_button-group.scss | 0 .../button-group/button-group.config.yml | 0 .../button-group/button-group.html | 0 .../button/README.md | 0 .../button/_button.scss | 12 +- .../button/button.config.yml | 0 .../button/button.html | 0 .../checkbox/_checkbox.scss | 0 .../checkbox/checkbox.html | 0 .../checkbox/checkbox.yml | 0 .../fieldset/_fieldset.scss | 0 .../form-elements/fieldset/fieldset.html | 1 + .../form-control/_form-control.scss | 6 +- .../form-control/form-control--invalid.html | 0 .../form-control/form-control.html | 0 .../form-group/_form-group.scss | 0 .../form-group/form-group--invalid.html | 0 .../form-group/form-group.html | 0 .../form-label/_form-label.scss | 5 +- .../form-label/form-label--invalid.html | 0 .../form-label/form-label.html | 0 .../form-text/_form-text.scss | 0 .../form-text/form-text.html | 0 .../legend/_legend.scss | 4 +- .../legend/legend.html | 0 .../radio/_radio.scss | 0 .../radio/radio.html | 0 .../radio/radio.yml | 0 .../input-elements/fieldset/fieldset.html | 1 - components/01-atoms/media/avatar/_avatar.scss | 5 + components/01-atoms/media/avatar/avatar.html | 31 +- .../favicon/favicon-blue/favicon-blue.html | 18 - .../favicon/favicon-red/favicon-red.html | 18 - components/01-atoms/media/figure/_figure.scss | 10 +- components/01-atoms/media/icon/_icon.scss | 82 +- .../01-atoms/media/icon/icon.config.yml | 2 +- components/01-atoms/media/icon/icon.html | 34 +- components/01-atoms/media/logo/logo.html | 68 +- .../01-atoms/text/block/code/_code.scss | 12 +- .../01-atoms/text/block/date/_date.scss | 28 +- .../text/block/duration/_duration.scss | 4 +- .../01-atoms/text/block/edition/_edition.scss | 65 +- .../01-atoms/text/block/edition/edition.html | 36 +- .../text/block/footnote/_footnote.scss | 14 +- .../01-atoms/text/block/heading/_heading.scss | 68 +- .../01-atoms/text/block/label/_label.scss | 10 +- .../01-atoms/text/block/label/label.html | 44 +- .../text/block/list/_checked-list.scss | 3 +- .../text/block/list/_ordered-list.scss | 21 +- .../01-atoms/text/block/list/_tuple-list.scss | 7 +- .../text/block/list/_unordered-list.scss | 16 +- .../text/block/paragraph/_paragraph.scss | 24 +- .../text/block/quote/_block-quote.scss | 8 +- .../text/block/quote/_pull-quote.scss | 9 +- .../01-atoms/text/block/table/_table.scss | 26 +- .../text/block/tag-list/_tag-list.scss | 11 +- .../inline/accentuation/_accentuation.scss | 3 +- .../01-atoms/text/inline/link/_link.scss | 14 +- .../01-atoms/text/inline/link/link.html | 4 +- .../collapse-toggler/_collapse-toggler.scss | 1 + .../togglers/multi-toggler/multi-toggler.html | 15 +- .../animation/waiting-dots/_waiting-dots.scss | 18 +- .../horizontal-line/_horizontal-line.scss | 2 +- .../author-bio/_author-bio.scss | 21 +- .../author-bio/author-bio-long.html | 2 +- .../author-bio/author-bio-short.html | 4 +- .../conclusion/_conclusion.scss | 30 +- .../content-separator/_content-separator.scss | 7 +- .../footnote-section/_footnote-section.scss | 13 +- .../info-box/info-box.scss | 11 +- .../quotes/long-quote/_long-quote.scss | 27 +- .../quotes/long-quote/long-quote.html | 2 +- .../quotes/super-quote/_super-quote.scss | 6 +- .../quotes/super-quote/super-quote.html | 2 +- .../reference/_reference.scss | 10 +- .../reference/reference.html | 2 +- .../share-section/_share-section.scss | 4 +- .../share-section/share-section.html | 2 +- .../table-of-contents/_table-of-contents.scss | 15 +- .../tag-section/_tag-section.scss | 6 +- components/02-molecules/navbar/_navbar.scss | 3 - .../search/search-form/_search-form.scss | 7 +- .../search/search-result/_search-result.scss | 6 +- .../visual-elements/card/_card.scss | 35 +- .../visual-elements/card/card.html | 4 +- .../_date-location-section.scss | 1 + .../dialog-banner/_dialog-banner.scss | 4 +- .../eyecatcher/_eyecatcher.scss | 7 +- .../header/claim-header/_claim-header.scss | 15 +- .../header/claim-header/claim-header.html | 2 +- .../header/image-header/_image-header.scss | 38 +- .../header/image-header/image-header.html | 12 +- .../_landing-page-header--blue.scss | 15 - .../_landing-page-header--centered-big.scss | 14 - .../_landing-page-header--centered.scss | 14 - .../_landing-page-header--demo-classes.scss | 78 - .../_landing-page-header--red.scss | 15 - .../_landing-page-header.scss | 52 +- .../landing-page-header.html | 83 +- .../header/staff-header/_staff-header.scss | 62 +- .../header/staff-header/staff-header.html | 2 +- .../standard-header/_standard-header.scss | 77 +- .../header/standard-header/config.jsx | 6 +- .../standard-header/standard-header.html | 4 +- .../header/text-header/_text-header.scss | 25 +- .../header/text-header/text-header.html | 2 +- .../header/topic-header/_topic-header.scss | 77 +- .../header/topic-header/topic-header.html | 104 +- .../visual-elements/paginator/_paginator.scss | 12 +- .../service-intro/_service-intro.scss | 15 +- .../service-intro/service-intro.html | 10 +- .../social-media-bar/_social-media-bar.scss | 5 + .../_default-full-width-teaser.scss | 24 +- .../default-full-width-teaser.html | 6 +- .../_abstract-list-teaser.scss | 27 +- .../abstract-list-teaser.html | 8 +- .../case-list-teaser/_case-list-teaser.scss | 17 +- .../case-list-teaser/case-list-teaser.html | 6 +- .../event-list-teaser/_event-list-teaser.scss | 21 +- .../event-list-teaser/event-list-teaser.html | 10 +- .../image-list-teaser/_image-list-teaser.scss | 39 + .../image-list-teaser.config.yml} | 0 .../image-list-teaser/image-list-teaser.html | 10 + .../_podcast-list-teaser.scss | 10 +- .../podcast-list-teaser/config.jsx | 4 +- .../_product-list-teaser.scss | 26 +- .../_project-list-teaser.scss | 18 +- .../project-list-teaser.html | 8 +- .../_simple-list-teaser.scss | 15 +- .../simple-list-teaser.html | 12 +- .../topic-list-teaser/_topic-list-teaser.scss | 37 +- .../topic-list-teaser/topic-list-teaser.html | 30 +- .../_training-list-teaser.scss | 18 +- .../_big-content-tile-teaser.scss | 54 +- .../big-content-tile-teaser.html | 12 +- .../case-tile-teaser/_case-tile-teaser.scss | 23 +- .../case-tile-teaser/case-tile-teaser.html | 10 +- .../_content-tile-teaser.scss | 17 +- .../content-tile-teaser.html | 16 +- .../event-tile-teaser/event-tile-teaser.html | 8 +- .../_podcast-tile-teaser.scss | 82 +- .../podcast-tile-teaser/config.jsx | 4 +- .../podcast-tile-teaser.html | 14 +- .../_simple-tile-teaser.scss | 2 +- .../_static-tile-teaser.scss | 14 +- .../visual-elements/toolbar/_toolbar.scss | 1 + .../icon-divider/_icon-divider.scss | 7 +- .../icon-divider/icon-divider.html | 2 +- .../_image-divider-center.scss | 27 +- .../image-divider-center.html | 6 +- .../_image-divider-right.scss | 12 +- .../image-divider-right.html | 2 +- .../triplet-divider/_triplet-divider.scss | 15 +- .../two-column-image-divider.html | 4 +- .../visual-divider/wall-note/_wall-note.scss | 42 +- .../visual-divider/wall-note/wall-note.html | 20 +- .../article-intro/_article-intro.scss | 2 +- .../article-intro/article-intro.html | 2 +- components/03-organisms/footer/_footer.scss | 20 +- .../navbar/_navbar-common.scss | 21 +- .../navbar/_navbar-desktop.scss | 0 .../navbar/_navbar-mobile.scss | 11 +- components/03-organisms/navbar/_navbar.scss | 3 + .../navbar/navbar--transparent.html | 4 +- .../navbar/navbar.config.yml | 0 .../navbar/navbar.html | 4 +- .../navbar/navbar.js | 0 .../navbar/readme.md | 0 .../newsletter-optin/_newsletter-optin.scss | 13 +- .../newsletter-optin/newsletter-optin.html | 32 +- .../_search-result-list.scss | 2 +- .../aggregator-page/aggregator-page.html | 34 +- .../article-page-default.html | 50 +- .../_article-page-with-header.scss | 0 .../article-page-with-header.config.yml | 9 - .../article-page-with-header.html | 442 - .../_artist-collabo-page.scss | 73 +- .../artist-collabo-page.html | 173 +- .../case-study-overview.html | 18 +- .../case-study-page/case-study-page.html | 293 +- .../04-pages/culture-page/_culture-page.scss | 22 - .../04-pages/culture-page/culture-page.html | 127 +- .../04-pages/landing-page/landing-page.html | 251 +- .../04-pages/magazine-page/magazine-page.html | 455 +- .../innoq-podcast-detail-page.html | 4 +- .../_innoq-podcast-overview-page.scss | 16 + .../innoq-podcast-overview-page.html | 16 +- .../podcast-overview-page.html | 103 +- .../_security-podcast-detail-page.scss | 13 + .../security-podcast-detail-page.html | 4 +- .../_security-podcast-overview-page.scss | 9 + .../security-podcast-overview-page.html | 2 +- .../_product-microsite-page.scss | 4 +- .../product-microsite-page.html | 30 +- .../service-detail-page.html | 6 +- .../services-overview-page.html | 18 +- .../04-pages/staff-page/staff-page.html | 20 +- components/04-pages/talk-page/_talk-page.scss | 8 +- components/04-pages/talk-page/talk-page.html | 2 +- .../04-pages/topic-page/_topic-page.scss | 4 +- .../04-pages/topic-page/topic-page.html | 58 +- .../training-detail-page.html | 4 +- .../_trainings-overview-page.scss | 23 - .../trainings-overview-page.html | 416 +- docs/01-index.html | 4 +- docs/{ => 02-Basics}/02-colors.html | 63 + docs/02-Basics/03-favicons.html | 1 + fractal.config.js | 4 +- .../podcast}/visual-podcastdetail-test-02.svg | 0 .../podcast}/visual-podcastdetail-test-03.svg | 0 .../podcast}/visual-podcastdetail-test-04.svg | 0 .../podcast}/visual-podcastdetail-test_01.svg | 0 .../edition-01}/tower-spiderman.jpg | Bin .../edition-01}/visual-header-girl-1444.jpg | Bin .../edition-01}/visual-header-girl.jpg | Bin .../edition-01}/visual-header-heads.jpg | Bin .../edition-01}/visual-header-ice-1444.jpg | Bin .../edition-01}/visual-header-ice.jpg | Bin .../edition-01}/visual-header-igel-1444.jpg | Bin .../edition-01}/visual-header-igel.jpg | Bin .../visual-header-koralle-1444.jpg | Bin .../edition-01}/visual-header-koralle.jpg | Bin .../visual-header-landing-page.jpg | Bin .../edition-01}/visual-header-medusa-1444.jpg | Bin .../edition-01}/visual-header-medusa.jpg | Bin .../edition-01}/visual-newsletter.jpg | Bin .../edition-02/edition02-canyon-01.jpg | Bin 0 -> 83956 bytes .../edition-02/edition02-canyon-02.jpg | Bin 0 -> 30411 bytes .../edition-02/edition02-canyon-03.jpg | Bin 0 -> 243354 bytes .../edition-02/edition02-canyon-04.jpg | Bin 0 -> 332513 bytes .../edition-02/edition02-canyon-05.jpg | Bin 0 -> 48915 bytes .../edition-02/edition02-cloth-01.jpg} | Bin .../edition-02/edition02-cloth-02.jpg | Bin 0 -> 127564 bytes .../edition-02/edition02-cloth-03.jpg | Bin 0 -> 85311 bytes .../edition-02/edition02-cloth-04.jpg | Bin 0 -> 123962 bytes .../edition-02/edition02-data-01.jpg | Bin 0 -> 107689 bytes .../edition-02/edition02-data-02.jpg | Bin 0 -> 144523 bytes .../edition-02/edition02-data-03.jpg | Bin 0 -> 141125 bytes .../edition-02/edition02-data-04.jpg | Bin 0 -> 165489 bytes .../edition-02/edition02-data-05.jpg | Bin 0 -> 98122 bytes .../edition-02/edition02-data-06.jpg | Bin 0 -> 61438 bytes .../edition-02/edition02-human-01.jpg | Bin 0 -> 169125 bytes .../edition-02/edition02-human-02.jpg | Bin 0 -> 200200 bytes .../edition-02/edition02-human-03.jpg | Bin 0 -> 116007 bytes .../edition-02/edition02-human-04.jpg | Bin 0 -> 138214 bytes .../edition-02/edition02-human-05.jpg | Bin 0 -> 162995 bytes .../edition-02/edition02-human-06.jpg | Bin 0 -> 175005 bytes .../edition-02/edition02-human-07.jpg | Bin 0 -> 164094 bytes .../edition-02/edition02-human-08.jpg | Bin 0 -> 205473 bytes .../general/visual-art-01.jpg} | Bin .../general}/visual-culture-01.jpg | Bin .../general}/visual-culture-02.jpg | Bin .../general}/visual-culture-03.jpg | Bin .../general}/visual-culture-04.jpg | Bin .../general}/visual-culture-05.jpg | Bin .../general/visual-podcast.jpg} | Bin .../general}/visual-staff-01.jpg | Bin .../general}/visual-trainings-01.jpg | Bin .../general}/visual-trainings-02.jpg | Bin .../general}/visual-trainings-03.jpg | Bin .../general}/visual-trainings-04.jpg | Bin .../general}/visual-trainings-05.jpg | Bin .../general}/visual-trainings-06.jpg | Bin .../general}/visual-trainings-07.jpg | Bin .../general}/visual-workshop-01.jpg | Bin .../general}/visual-workshop-02.jpg | Bin .../general}/visual-workshop-03.jpg | Bin .../general}/visual-workshop-04.jpg | Bin .../general}/visual-workshop-05.jpg | Bin .../general}/visual-workshop-06.jpg | Bin .../general}/visual-workshop-07.jpg | Bin .../general}/visual-workshop-08.jpg | Bin .../general}/visual-workshop-09.jpg | Bin .../general}/visual-workshop-10.jpg | Bin .../general}/visual-workshop-11.jpg | Bin .../general}/visual-workshop-12.jpg | Bin .../general}/visual-workshop-13.jpg | Bin .../general}/visual-workshop-14.jpg | Bin .../general}/visual-workshop-15.jpg | Bin .../general}/visual-workshop-16.jpg | Bin .../general}/visual-workshop-17.jpg | Bin lib/images/edition02-01.jpg | Bin 92729 -> 0 bytes lib/images/edition02-02.jpg | Bin 122937 -> 0 bytes .../{ => example-content}/heribert-links.png | Bin .../{ => example-content}/heribert-rechts.png | Bin lib/images/{ => example-content}/heribert.jpg | Bin .../favicon-blue/android-icon-192x192.png | Bin .../edition-01}/favicon-blue/anleitung.txt | 0 .../favicon-blue/apple-icon-114x114.png | Bin .../favicon-blue/apple-icon-120x120.png | Bin .../favicon-blue/apple-icon-144x144.png | Bin .../favicon-blue/apple-icon-152x152.png | Bin .../favicon-blue/apple-icon-180x180.png | Bin .../favicon-blue/apple-icon-57x57.png | Bin .../favicon-blue/apple-icon-60x60.png | Bin .../favicon-blue/apple-icon-72x72.png | Bin .../favicon-blue/apple-icon-76x76.png | Bin .../favicon-blue/browserconfig.xml | 0 .../favicon-blue/favicon-16x16.png | Bin .../favicon-blue/favicon-256x256.png | Bin .../favicon-blue/favicon-32x32.png | Bin .../favicon-blue/favicon-96x96.png | Bin .../edition-01}/favicon-blue/favicon.ico | Bin .../edition-01}/favicon-blue/favicon.svg | 0 .../favicon-blue/ms-icon-144x144.png | Bin .../favicon-blue/ms-icon-150x150.png | Bin .../favicon-blue/ms-icon-310x310.png | Bin .../favicon-blue/ms-icon-70x70.png | Bin .../favicon-red/android-icon-192x192.png | Bin .../edition-01}/favicon-red/anleitung.txt | 0 .../favicon-red/apple-icon-114x114.png | Bin .../favicon-red/apple-icon-120x120.png | Bin .../favicon-red/apple-icon-144x144.png | Bin .../favicon-red/apple-icon-152x152.png | Bin .../favicon-red/apple-icon-180x180.png | Bin .../favicon-red/apple-icon-57x57.png | Bin .../favicon-red/apple-icon-60x60.png | Bin .../favicon-red/apple-icon-72x72.png | Bin .../favicon-red/apple-icon-76x76.png | Bin .../edition-01}/favicon-red/browserconfig.xml | 0 .../edition-01}/favicon-red/favicon-16x16.png | Bin .../favicon-red/favicon-256x256.png | Bin .../edition-01}/favicon-red/favicon-32x32.png | Bin .../edition-01}/favicon-red/favicon-96x96.png | Bin .../edition-01}/favicon-red/favicon.ico | Bin .../edition-01}/favicon-red/favicon.svg | 0 .../favicon-red/ms-icon-144x144.png | Bin .../favicon-red/ms-icon-150x150.png | Bin .../favicon-red/ms-icon-310x310.png | Bin .../edition-01}/favicon-red/ms-icon-70x70.png | Bin lib/images/favicons/edition-02/anleitung.txt | 22 + .../edition-02/favicon-apricot/favicon.svg | 16 + .../edition-02/favicon-petrol/favicon.svg | 16 + lib/images/icons/arrow-long-right-red.svg | 13 - lib/images/icons/arrow-long-right-white.svg | 13 - ...ng-right-blue.svg => arrow-long-right.svg} | 0 .../{ => logos}/business_technology.svg | 378 +- .../edition-01/png}/innoq-logo--bluered.png | Bin .../edition-01/png}/innoq-logo--redblue.png | Bin .../edition-01/png}/innoq-logo--whiteblue.png | Bin .../edition-01/png}/innoq-logo--whitered.png | Bin .../png}/innoq-logo-square--bluered.png | Bin .../png}/innoq-logo-square--whiteblue.png | Bin .../png}/innoq-logo-square--whitered.png | Bin .../edition-01/svg}/innoq-logo--bluered.svg | 0 .../edition-01/svg}/innoq-logo--redblue.svg | 0 .../edition-01/svg}/innoq-logo--whiteblue.svg | 0 .../edition-01/svg}/innoq-logo--whitered.svg | 0 .../svg}/innoq-logo-square--bluered.svg | 0 .../svg}/innoq-logo-square--whiteblue.svg | 0 .../svg}/innoq-logo-square--whitered.svg | 0 .../png/innoq-logo--apricotpetrol.png | Bin 0 -> 29826 bytes .../png/innoq-logo--petrolapricot.png | Bin 0 -> 29708 bytes .../svg/innoq-logo--apricotpetrol.svg | 14 + .../svg/innoq-logo--petrolapricot.svg | 14 + .../svg/innoq-logo--whiteapricot.svg | 14 + .../svg/innoq-logo--whitepetrol.svg | 14 + .../svg}/innoq-logo-square--whiteapricot.svg | 0 .../svg}/innoq-logo-square--whitepetrol.svg | 0 lib/images/{ => logos}/isaqb.svg | 0 .../monochrome/png}/innoq-logo--black.png | Bin .../png}/innoq-logo--monochrome.png | Bin .../monochrome/png}/innoq-logo--white.png | Bin .../monochrome/svg}/innoq-logo--black.svg | 0 .../svg}/innoq-logo--monochrome.svg | 0 .../monochrome/svg}/innoq-logo--white.svg | 0 lib/images/ornaments/zigzag--apricot.svg | 1 + lib/images/{ => ornaments}/zigzag--blue.svg | 0 lib/images/ornaments/zigzag--petrol.svg | 1 + lib/images/{ => ornaments}/zigzag--red.svg | 0 lib/images/{ => ornaments}/zigzag--white.svg | 0 .../podcast-channel-cover-01.jpg | Bin .../podcast-channel-cover-02.jpg | Bin lib/images/podcast-header.jpg | Bin 148395 -> 0 bytes lib/scripts/index.js | 4 +- lib/styles/elements/_base.scss | 2 +- lib/styles/index.scss | 304 +- lib/styles/objects/_page-layout-default.scss | 3 +- lib/styles/objects/_page-layout-grid.scss | 5 +- lib/styles/settings/_colors.scss | 157 +- lib/styles/settings/_spacings.scss | 63 +- lib/styles/settings/_theme-apripetrol.scss | 429 + lib/styles/settings/_theme-matthew.scss | 353 - lib/styles/settings/_typography.scss | 569 +- lib/styles/styleguide-theme.scss | 34 +- lib/styles/tools/_author.scss | 22 +- lib/styles/tools/_bg-images.scss | 334 + lib/styles/tools/_text.scss | 104 +- lib/styles/trumps/_hacks.scss | 6 +- lib/styles/trumps/_styleguide.scss | 4 +- package.json | 1 + public/.gitkeep | 0 theme-overrides/partials/header.nunj | 23 +- yarn.lock | 14789 ++++++++-------- 400 files changed, 11036 insertions(+), 12067 deletions(-) rename components/01-atoms/{input-elements => form-elements}/alert/_alert.scss (68%) rename components/01-atoms/{input-elements => form-elements}/alert/alert--error.html (100%) rename components/01-atoms/{input-elements => form-elements}/alert/alert--warn.html (100%) rename components/01-atoms/{input-elements => form-elements}/alert/alert.config.yml (100%) rename components/01-atoms/{input-elements => form-elements}/alert/alert.html (100%) rename components/01-atoms/{input-elements => form-elements}/button-group/_button-group.scss (100%) rename components/01-atoms/{input-elements => form-elements}/button-group/button-group.config.yml (100%) rename components/01-atoms/{input-elements => form-elements}/button-group/button-group.html (100%) rename components/01-atoms/{input-elements => form-elements}/button/README.md (100%) rename components/01-atoms/{input-elements => form-elements}/button/_button.scss (81%) rename components/01-atoms/{input-elements => form-elements}/button/button.config.yml (100%) rename components/01-atoms/{input-elements => form-elements}/button/button.html (100%) rename components/01-atoms/{input-elements => form-elements}/checkbox/_checkbox.scss (100%) rename components/01-atoms/{input-elements => form-elements}/checkbox/checkbox.html (100%) rename components/01-atoms/{input-elements => form-elements}/checkbox/checkbox.yml (100%) rename components/01-atoms/{input-elements => form-elements}/fieldset/_fieldset.scss (100%) create mode 100644 components/01-atoms/form-elements/fieldset/fieldset.html rename components/01-atoms/{input-elements => form-elements}/form-control/_form-control.scss (90%) rename components/01-atoms/{input-elements => form-elements}/form-control/form-control--invalid.html (100%) rename components/01-atoms/{input-elements => form-elements}/form-control/form-control.html (100%) rename components/01-atoms/{input-elements => form-elements}/form-group/_form-group.scss (100%) rename components/01-atoms/{input-elements => form-elements}/form-group/form-group--invalid.html (100%) rename components/01-atoms/{input-elements => form-elements}/form-group/form-group.html (100%) rename components/01-atoms/{input-elements => form-elements}/form-label/_form-label.scss (83%) rename components/01-atoms/{input-elements => form-elements}/form-label/form-label--invalid.html (100%) rename components/01-atoms/{input-elements => form-elements}/form-label/form-label.html (100%) rename components/01-atoms/{input-elements => form-elements}/form-text/_form-text.scss (100%) rename components/01-atoms/{input-elements => form-elements}/form-text/form-text.html (100%) rename components/01-atoms/{input-elements => form-elements}/legend/_legend.scss (55%) rename components/01-atoms/{input-elements => form-elements}/legend/legend.html (100%) rename components/01-atoms/{input-elements => form-elements}/radio/_radio.scss (100%) rename components/01-atoms/{input-elements => form-elements}/radio/radio.html (100%) rename components/01-atoms/{input-elements => form-elements}/radio/radio.yml (100%) delete mode 100644 components/01-atoms/input-elements/fieldset/fieldset.html delete mode 100644 components/01-atoms/media/favicon/favicon-blue/favicon-blue.html delete mode 100644 components/01-atoms/media/favicon/favicon-red/favicon-red.html delete mode 100644 components/02-molecules/navbar/_navbar.scss delete mode 100644 components/02-molecules/visual-elements/header/landing-page-header/_landing-page-header--blue.scss delete mode 100644 components/02-molecules/visual-elements/header/landing-page-header/_landing-page-header--centered-big.scss delete mode 100644 components/02-molecules/visual-elements/header/landing-page-header/_landing-page-header--centered.scss delete mode 100644 components/02-molecules/visual-elements/header/landing-page-header/_landing-page-header--demo-classes.scss delete mode 100644 components/02-molecules/visual-elements/header/landing-page-header/_landing-page-header--red.scss create mode 100644 components/02-molecules/visual-elements/teaser/list-teaser/image-list-teaser/_image-list-teaser.scss rename components/{01-atoms/text/block/horizontal-ruler/_horizontal-ruler.scss => 02-molecules/visual-elements/teaser/list-teaser/image-list-teaser/image-list-teaser.config.yml} (100%) create mode 100644 components/02-molecules/visual-elements/teaser/list-teaser/image-list-teaser/image-list-teaser.html rename components/{02-molecules => 03-organisms}/navbar/_navbar-common.scss (93%) rename components/{02-molecules => 03-organisms}/navbar/_navbar-desktop.scss (100%) rename components/{02-molecules => 03-organisms}/navbar/_navbar-mobile.scss (90%) create mode 100644 components/03-organisms/navbar/_navbar.scss rename components/{02-molecules => 03-organisms}/navbar/navbar--transparent.html (97%) rename components/{02-molecules => 03-organisms}/navbar/navbar.config.yml (100%) rename components/{02-molecules => 03-organisms}/navbar/navbar.html (97%) rename components/{02-molecules => 03-organisms}/navbar/navbar.js (100%) rename components/{02-molecules => 03-organisms}/navbar/readme.md (100%) rename components/{02-molecules/visual-elements => 03-organisms}/newsletter-optin/_newsletter-optin.scss (78%) rename components/{02-molecules/visual-elements => 03-organisms}/newsletter-optin/newsletter-optin.html (60%) delete mode 100644 components/04-pages/article-pages/article-page-with-header/_article-page-with-header.scss delete mode 100644 components/04-pages/article-pages/article-page-with-header/article-page-with-header.config.yml delete mode 100644 components/04-pages/article-pages/article-page-with-header/article-page-with-header.html rename docs/{ => 02-Basics}/02-colors.html (61%) create mode 100644 docs/02-Basics/03-favicons.html rename lib/images/{ => bg-images/edition-01/podcast}/visual-podcastdetail-test-02.svg (100%) rename lib/images/{ => bg-images/edition-01/podcast}/visual-podcastdetail-test-03.svg (100%) rename lib/images/{ => bg-images/edition-01/podcast}/visual-podcastdetail-test-04.svg (100%) rename lib/images/{ => bg-images/edition-01/podcast}/visual-podcastdetail-test_01.svg (100%) rename lib/images/{ => bg-images/edition-01}/tower-spiderman.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-header-girl-1444.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-header-girl.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-header-heads.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-header-ice-1444.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-header-ice.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-header-igel-1444.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-header-igel.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-header-koralle-1444.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-header-koralle.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-header-landing-page.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-header-medusa-1444.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-header-medusa.jpg (100%) rename lib/images/{ => bg-images/edition-01}/visual-newsletter.jpg (100%) create mode 100755 lib/images/bg-images/edition-02/edition02-canyon-01.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-canyon-02.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-canyon-03.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-canyon-04.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-canyon-05.jpg rename lib/images/{visual-art-01.jpg => bg-images/edition-02/edition02-cloth-01.jpg} (100%) create mode 100755 lib/images/bg-images/edition-02/edition02-cloth-02.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-cloth-03.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-cloth-04.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-data-01.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-data-02.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-data-03.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-data-04.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-data-05.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-data-06.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-human-01.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-human-02.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-human-03.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-human-04.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-human-05.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-human-06.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-human-07.jpg create mode 100755 lib/images/bg-images/edition-02/edition02-human-08.jpg rename lib/images/{visual-art-02.jpg => bg-images/general/visual-art-01.jpg} (100%) rename lib/images/{ => bg-images/general}/visual-culture-01.jpg (100%) rename lib/images/{ => bg-images/general}/visual-culture-02.jpg (100%) rename lib/images/{ => bg-images/general}/visual-culture-03.jpg (100%) rename lib/images/{ => bg-images/general}/visual-culture-04.jpg (100%) rename lib/images/{ => bg-images/general}/visual-culture-05.jpg (100%) rename lib/images/{podcast-header-big-screens.jpg => bg-images/general/visual-podcast.jpg} (100%) rename lib/images/{ => bg-images/general}/visual-staff-01.jpg (100%) rename lib/images/{ => bg-images/general}/visual-trainings-01.jpg (100%) rename lib/images/{ => bg-images/general}/visual-trainings-02.jpg (100%) rename lib/images/{ => bg-images/general}/visual-trainings-03.jpg (100%) rename lib/images/{ => bg-images/general}/visual-trainings-04.jpg (100%) rename lib/images/{ => bg-images/general}/visual-trainings-05.jpg (100%) rename lib/images/{ => bg-images/general}/visual-trainings-06.jpg (100%) rename lib/images/{ => bg-images/general}/visual-trainings-07.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-01.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-02.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-03.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-04.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-05.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-06.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-07.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-08.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-09.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-10.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-11.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-12.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-13.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-14.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-15.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-16.jpg (100%) rename lib/images/{ => bg-images/general}/visual-workshop-17.jpg (100%) delete mode 100644 lib/images/edition02-01.jpg delete mode 100644 lib/images/edition02-02.jpg rename lib/images/{ => example-content}/heribert-links.png (100%) rename lib/images/{ => example-content}/heribert-rechts.png (100%) rename lib/images/{ => example-content}/heribert.jpg (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/android-icon-192x192.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/anleitung.txt (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/apple-icon-114x114.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/apple-icon-120x120.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/apple-icon-144x144.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/apple-icon-152x152.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/apple-icon-180x180.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/apple-icon-57x57.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/apple-icon-60x60.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/apple-icon-72x72.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/apple-icon-76x76.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/browserconfig.xml (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/favicon-16x16.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/favicon-256x256.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/favicon-32x32.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/favicon-96x96.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/favicon.ico (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/favicon.svg (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/ms-icon-144x144.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/ms-icon-150x150.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/ms-icon-310x310.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-blue/ms-icon-70x70.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/android-icon-192x192.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/anleitung.txt (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/apple-icon-114x114.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/apple-icon-120x120.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/apple-icon-144x144.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/apple-icon-152x152.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/apple-icon-180x180.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/apple-icon-57x57.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/apple-icon-60x60.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/apple-icon-72x72.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/apple-icon-76x76.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/browserconfig.xml (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/favicon-16x16.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/favicon-256x256.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/favicon-32x32.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/favicon-96x96.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/favicon.ico (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/favicon.svg (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/ms-icon-144x144.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/ms-icon-150x150.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/ms-icon-310x310.png (100%) rename lib/images/{ => favicons/edition-01}/favicon-red/ms-icon-70x70.png (100%) create mode 100644 lib/images/favicons/edition-02/anleitung.txt create mode 100644 lib/images/favicons/edition-02/favicon-apricot/favicon.svg create mode 100644 lib/images/favicons/edition-02/favicon-petrol/favicon.svg delete mode 100644 lib/images/icons/arrow-long-right-red.svg delete mode 100644 lib/images/icons/arrow-long-right-white.svg rename lib/images/icons/{arrow-long-right-blue.svg => arrow-long-right.svg} (100%) rename lib/images/{ => logos}/business_technology.svg (99%) rename lib/images/{ => logos/edition-01/png}/innoq-logo--bluered.png (100%) rename lib/images/{ => logos/edition-01/png}/innoq-logo--redblue.png (100%) rename lib/images/{ => logos/edition-01/png}/innoq-logo--whiteblue.png (100%) rename lib/images/{ => logos/edition-01/png}/innoq-logo--whitered.png (100%) rename lib/images/{ => logos/edition-01/png}/innoq-logo-square--bluered.png (100%) rename lib/images/{ => logos/edition-01/png}/innoq-logo-square--whiteblue.png (100%) rename lib/images/{ => logos/edition-01/png}/innoq-logo-square--whitered.png (100%) rename lib/images/{ => logos/edition-01/svg}/innoq-logo--bluered.svg (100%) rename lib/images/{ => logos/edition-01/svg}/innoq-logo--redblue.svg (100%) rename lib/images/{ => logos/edition-01/svg}/innoq-logo--whiteblue.svg (100%) rename lib/images/{ => logos/edition-01/svg}/innoq-logo--whitered.svg (100%) rename lib/images/{ => logos/edition-01/svg}/innoq-logo-square--bluered.svg (100%) rename lib/images/{ => logos/edition-01/svg}/innoq-logo-square--whiteblue.svg (100%) rename lib/images/{ => logos/edition-01/svg}/innoq-logo-square--whitered.svg (100%) create mode 100755 lib/images/logos/edition-02/png/innoq-logo--apricotpetrol.png create mode 100755 lib/images/logos/edition-02/png/innoq-logo--petrolapricot.png create mode 100755 lib/images/logos/edition-02/svg/innoq-logo--apricotpetrol.svg create mode 100755 lib/images/logos/edition-02/svg/innoq-logo--petrolapricot.svg create mode 100755 lib/images/logos/edition-02/svg/innoq-logo--whiteapricot.svg create mode 100755 lib/images/logos/edition-02/svg/innoq-logo--whitepetrol.svg rename lib/images/{ => logos/edition-02/svg}/innoq-logo-square--whiteapricot.svg (100%) rename lib/images/{ => logos/edition-02/svg}/innoq-logo-square--whitepetrol.svg (100%) rename lib/images/{ => logos}/isaqb.svg (100%) rename lib/images/{ => logos/monochrome/png}/innoq-logo--black.png (100%) rename lib/images/{ => logos/monochrome/png}/innoq-logo--monochrome.png (100%) rename lib/images/{ => logos/monochrome/png}/innoq-logo--white.png (100%) rename lib/images/{ => logos/monochrome/svg}/innoq-logo--black.svg (100%) rename lib/images/{ => logos/monochrome/svg}/innoq-logo--monochrome.svg (100%) rename lib/images/{ => logos/monochrome/svg}/innoq-logo--white.svg (100%) create mode 100644 lib/images/ornaments/zigzag--apricot.svg rename lib/images/{ => ornaments}/zigzag--blue.svg (100%) create mode 100644 lib/images/ornaments/zigzag--petrol.svg rename lib/images/{ => ornaments}/zigzag--red.svg (100%) rename lib/images/{ => ornaments}/zigzag--white.svg (100%) rename lib/images/{ => podcast-channel-cover}/podcast-channel-cover-01.jpg (100%) rename lib/images/{ => podcast-channel-cover}/podcast-channel-cover-02.jpg (100%) delete mode 100644 lib/images/podcast-header.jpg create mode 100644 lib/styles/settings/_theme-apripetrol.scss delete mode 100644 lib/styles/settings/_theme-matthew.scss create mode 100644 lib/styles/tools/_bg-images.scss delete mode 100644 public/.gitkeep diff --git a/.sass-lint.yml b/.sass-lint.yml index 8c79d92cf..84875e31e 100644 --- a/.sass-lint.yml +++ b/.sass-lint.yml @@ -90,8 +90,8 @@ rules: empty-args: 2 hex-length: 2 hex-notation: 2 - indentation: 2 - leading-zero: 2 + indentation: 0 + leading-zero: 0 max-line-length: 0 max-file-line-count: 0 nesting-depth: 0 @@ -101,7 +101,7 @@ rules: order: 'concentric' order-explanation: Please use concentric property order. Details can be found here http://rhodesmill.org/brandon/2011/concentric-css/ pseudo-element: 2 - quotes: 2 + quotes: 0 shorthand-values: 2 url-quotes: 2 variable-for-property: 2 diff --git a/components/01-atoms/input-elements/alert/_alert.scss b/components/01-atoms/form-elements/alert/_alert.scss similarity index 68% rename from components/01-atoms/input-elements/alert/_alert.scss rename to components/01-atoms/form-elements/alert/_alert.scss index 62415bff0..8b1c582cc 100644 --- a/components/01-atoms/input-elements/alert/_alert.scss +++ b/components/01-atoms/form-elements/alert/_alert.scss @@ -1,15 +1,12 @@ -$alert-color: $brand-white; - .alert { @extend %heading-font-regular; display: flex; flex-wrap: nowrap; justify-content: space-between; - margin-bottom: $content-spacer-sm; + margin-bottom: $spacer-sm; padding: $spacer-xs; - line-height: $alert-line-height; color: $alert-color; - font-size: $alert-font-size-sm; + font-size: $font-size-base; &--info { background-color: $brand-info; @@ -30,10 +27,9 @@ $alert-color: $brand-white; color: inherit; } - @media screen and (min-width: $grid-breakpoint-md) { .alert { - margin-bottom: $content-spacer-base; - padding: $container-spacer-y-sm $container-spacer-x-sm; + margin-bottom: $spacer-md; + padding: $spacer-sm; } } diff --git a/components/01-atoms/input-elements/alert/alert--error.html b/components/01-atoms/form-elements/alert/alert--error.html similarity index 100% rename from components/01-atoms/input-elements/alert/alert--error.html rename to components/01-atoms/form-elements/alert/alert--error.html diff --git a/components/01-atoms/input-elements/alert/alert--warn.html b/components/01-atoms/form-elements/alert/alert--warn.html similarity index 100% rename from components/01-atoms/input-elements/alert/alert--warn.html rename to components/01-atoms/form-elements/alert/alert--warn.html diff --git a/components/01-atoms/input-elements/alert/alert.config.yml b/components/01-atoms/form-elements/alert/alert.config.yml similarity index 100% rename from components/01-atoms/input-elements/alert/alert.config.yml rename to components/01-atoms/form-elements/alert/alert.config.yml diff --git a/components/01-atoms/input-elements/alert/alert.html b/components/01-atoms/form-elements/alert/alert.html similarity index 100% rename from components/01-atoms/input-elements/alert/alert.html rename to components/01-atoms/form-elements/alert/alert.html diff --git a/components/01-atoms/input-elements/button-group/_button-group.scss b/components/01-atoms/form-elements/button-group/_button-group.scss similarity index 100% rename from components/01-atoms/input-elements/button-group/_button-group.scss rename to components/01-atoms/form-elements/button-group/_button-group.scss diff --git a/components/01-atoms/input-elements/button-group/button-group.config.yml b/components/01-atoms/form-elements/button-group/button-group.config.yml similarity index 100% rename from components/01-atoms/input-elements/button-group/button-group.config.yml rename to components/01-atoms/form-elements/button-group/button-group.config.yml diff --git a/components/01-atoms/input-elements/button-group/button-group.html b/components/01-atoms/form-elements/button-group/button-group.html similarity index 100% rename from components/01-atoms/input-elements/button-group/button-group.html rename to components/01-atoms/form-elements/button-group/button-group.html diff --git a/components/01-atoms/input-elements/button/README.md b/components/01-atoms/form-elements/button/README.md similarity index 100% rename from components/01-atoms/input-elements/button/README.md rename to components/01-atoms/form-elements/button/README.md diff --git a/components/01-atoms/input-elements/button/_button.scss b/components/01-atoms/form-elements/button/_button.scss similarity index 81% rename from components/01-atoms/input-elements/button/_button.scss rename to components/01-atoms/form-elements/button/_button.scss index 82c2f26bf..854592376 100644 --- a/components/01-atoms/input-elements/button/_button.scss +++ b/components/01-atoms/form-elements/button/_button.scss @@ -14,8 +14,7 @@ $default-btn-margin: $spacer-sm; border-radius: 0; background-color: $button-background; padding: $spacer-md $spacer-base; - line-height: $button-medium-line-height; - font-size: $button-medium-font-size; + font-size: $font-size-sm; &--cta { border-color: $button-cta-border-color; @@ -52,20 +51,17 @@ $default-btn-margin: $spacer-sm; &--small { padding: $spacer-sm $spacer-md; - line-height: $button-small-line-height; - font-size: $button-small-font-size; + font-size: $font-size-base; } &--condensed { padding: $spacer-xs $spacer-sm; - line-height: $button-small-line-height; - font-size: $button-small-font-size; + font-size: $font-size-base; } &--large { padding: $spacer-md $spacer-lg; - line-height: $button-large-line-height; - font-size: $button-large-font-size; + font-size: $font-size-md; } &--inverted { diff --git a/components/01-atoms/input-elements/button/button.config.yml b/components/01-atoms/form-elements/button/button.config.yml similarity index 100% rename from components/01-atoms/input-elements/button/button.config.yml rename to components/01-atoms/form-elements/button/button.config.yml diff --git a/components/01-atoms/input-elements/button/button.html b/components/01-atoms/form-elements/button/button.html similarity index 100% rename from components/01-atoms/input-elements/button/button.html rename to components/01-atoms/form-elements/button/button.html diff --git a/components/01-atoms/input-elements/checkbox/_checkbox.scss b/components/01-atoms/form-elements/checkbox/_checkbox.scss similarity index 100% rename from components/01-atoms/input-elements/checkbox/_checkbox.scss rename to components/01-atoms/form-elements/checkbox/_checkbox.scss diff --git a/components/01-atoms/input-elements/checkbox/checkbox.html b/components/01-atoms/form-elements/checkbox/checkbox.html similarity index 100% rename from components/01-atoms/input-elements/checkbox/checkbox.html rename to components/01-atoms/form-elements/checkbox/checkbox.html diff --git a/components/01-atoms/input-elements/checkbox/checkbox.yml b/components/01-atoms/form-elements/checkbox/checkbox.yml similarity index 100% rename from components/01-atoms/input-elements/checkbox/checkbox.yml rename to components/01-atoms/form-elements/checkbox/checkbox.yml diff --git a/components/01-atoms/input-elements/fieldset/_fieldset.scss b/components/01-atoms/form-elements/fieldset/_fieldset.scss similarity index 100% rename from components/01-atoms/input-elements/fieldset/_fieldset.scss rename to components/01-atoms/form-elements/fieldset/_fieldset.scss diff --git a/components/01-atoms/form-elements/fieldset/fieldset.html b/components/01-atoms/form-elements/fieldset/fieldset.html new file mode 100644 index 000000000..0cabd91ce --- /dev/null +++ b/components/01-atoms/form-elements/fieldset/fieldset.html @@ -0,0 +1 @@ +
Fieldset
diff --git a/components/01-atoms/input-elements/form-control/_form-control.scss b/components/01-atoms/form-elements/form-control/_form-control.scss similarity index 90% rename from components/01-atoms/input-elements/form-control/_form-control.scss rename to components/01-atoms/form-elements/form-control/_form-control.scss index 01c78fb39..6b0e87f75 100644 --- a/components/01-atoms/input-elements/form-control/_form-control.scss +++ b/components/01-atoms/form-elements/form-control/_form-control.scss @@ -5,8 +5,8 @@ transition: standard-transition(background-color); padding: $spacer-xs; width: 100%; - line-height: $form-control-line-height; - font-size: $form-control-font-size; + line-height: $paragraph-line-height; + font-size: $font-size-base; } .form-control { @@ -33,7 +33,7 @@ .custom-form-control { position: relative; transition: standard-transition(background-color, color, border-color); - min-height: ($base-line-height * 1rem); + min-height: ($paragraph-line-height * 1rem); &.form-control--invalid, .form-group--invalid & { diff --git a/components/01-atoms/input-elements/form-control/form-control--invalid.html b/components/01-atoms/form-elements/form-control/form-control--invalid.html similarity index 100% rename from components/01-atoms/input-elements/form-control/form-control--invalid.html rename to components/01-atoms/form-elements/form-control/form-control--invalid.html diff --git a/components/01-atoms/input-elements/form-control/form-control.html b/components/01-atoms/form-elements/form-control/form-control.html similarity index 100% rename from components/01-atoms/input-elements/form-control/form-control.html rename to components/01-atoms/form-elements/form-control/form-control.html diff --git a/components/01-atoms/input-elements/form-group/_form-group.scss b/components/01-atoms/form-elements/form-group/_form-group.scss similarity index 100% rename from components/01-atoms/input-elements/form-group/_form-group.scss rename to components/01-atoms/form-elements/form-group/_form-group.scss diff --git a/components/01-atoms/input-elements/form-group/form-group--invalid.html b/components/01-atoms/form-elements/form-group/form-group--invalid.html similarity index 100% rename from components/01-atoms/input-elements/form-group/form-group--invalid.html rename to components/01-atoms/form-elements/form-group/form-group--invalid.html diff --git a/components/01-atoms/input-elements/form-group/form-group.html b/components/01-atoms/form-elements/form-group/form-group.html similarity index 100% rename from components/01-atoms/input-elements/form-group/form-group.html rename to components/01-atoms/form-elements/form-group/form-group.html diff --git a/components/01-atoms/input-elements/form-label/_form-label.scss b/components/01-atoms/form-elements/form-label/_form-label.scss similarity index 83% rename from components/01-atoms/input-elements/form-label/_form-label.scss rename to components/01-atoms/form-elements/form-label/_form-label.scss index d4286b1b7..a4f4ae2e3 100644 --- a/components/01-atoms/input-elements/form-label/_form-label.scss +++ b/components/01-atoms/form-elements/form-label/_form-label.scss @@ -1,9 +1,10 @@ .form-label { @extend %heading-font-regular; + display: block; width: 100%; - line-height: $form-label-line-height; - font-size: $form-label-font-size; + color: $form-label-color; + font-size: $font-size-base; &--emphasized { @extend %heading-font-bold; diff --git a/components/01-atoms/input-elements/form-label/form-label--invalid.html b/components/01-atoms/form-elements/form-label/form-label--invalid.html similarity index 100% rename from components/01-atoms/input-elements/form-label/form-label--invalid.html rename to components/01-atoms/form-elements/form-label/form-label--invalid.html diff --git a/components/01-atoms/input-elements/form-label/form-label.html b/components/01-atoms/form-elements/form-label/form-label.html similarity index 100% rename from components/01-atoms/input-elements/form-label/form-label.html rename to components/01-atoms/form-elements/form-label/form-label.html diff --git a/components/01-atoms/input-elements/form-text/_form-text.scss b/components/01-atoms/form-elements/form-text/_form-text.scss similarity index 100% rename from components/01-atoms/input-elements/form-text/_form-text.scss rename to components/01-atoms/form-elements/form-text/_form-text.scss diff --git a/components/01-atoms/input-elements/form-text/form-text.html b/components/01-atoms/form-elements/form-text/form-text.html similarity index 100% rename from components/01-atoms/input-elements/form-text/form-text.html rename to components/01-atoms/form-elements/form-text/form-text.html diff --git a/components/01-atoms/input-elements/legend/_legend.scss b/components/01-atoms/form-elements/legend/_legend.scss similarity index 55% rename from components/01-atoms/input-elements/legend/_legend.scss rename to components/01-atoms/form-elements/legend/_legend.scss index 697a2f90c..13867d014 100644 --- a/components/01-atoms/input-elements/legend/_legend.scss +++ b/components/01-atoms/form-elements/legend/_legend.scss @@ -1,5 +1,7 @@ .legend { @extend %heading-font-heavy; + margin-bottom: $spacer-md; - font-size: $h3-font-size-small; + color: $form-legend-color; + font-size: $font-size-lg; } diff --git a/components/01-atoms/input-elements/legend/legend.html b/components/01-atoms/form-elements/legend/legend.html similarity index 100% rename from components/01-atoms/input-elements/legend/legend.html rename to components/01-atoms/form-elements/legend/legend.html diff --git a/components/01-atoms/input-elements/radio/_radio.scss b/components/01-atoms/form-elements/radio/_radio.scss similarity index 100% rename from components/01-atoms/input-elements/radio/_radio.scss rename to components/01-atoms/form-elements/radio/_radio.scss diff --git a/components/01-atoms/input-elements/radio/radio.html b/components/01-atoms/form-elements/radio/radio.html similarity index 100% rename from components/01-atoms/input-elements/radio/radio.html rename to components/01-atoms/form-elements/radio/radio.html diff --git a/components/01-atoms/input-elements/radio/radio.yml b/components/01-atoms/form-elements/radio/radio.yml similarity index 100% rename from components/01-atoms/input-elements/radio/radio.yml rename to components/01-atoms/form-elements/radio/radio.yml diff --git a/components/01-atoms/input-elements/fieldset/fieldset.html b/components/01-atoms/input-elements/fieldset/fieldset.html deleted file mode 100644 index 6f88def41..000000000 --- a/components/01-atoms/input-elements/fieldset/fieldset.html +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/components/01-atoms/media/avatar/_avatar.scss b/components/01-atoms/media/avatar/_avatar.scss index 2053ba303..8085cf518 100644 --- a/components/01-atoms/media/avatar/_avatar.scss +++ b/components/01-atoms/media/avatar/_avatar.scss @@ -1,3 +1,8 @@ +$avatar-size-xs: ms(10); //~40px +$avatar-size-sm: ms(14); //~55px +$avatar-size-md: ms(18); //~80px +$avatar-size-base: ms(22); //~120px + .avatar { display: inline-block; } diff --git a/components/01-atoms/media/avatar/avatar.html b/components/01-atoms/media/avatar/avatar.html index 287a9be7c..654bb6898 100644 --- a/components/01-atoms/media/avatar/avatar.html +++ b/components/01-atoms/media/avatar/avatar.html @@ -1,19 +1,18 @@ -
-
- - Portrait von Heribert Innoq - -
+
+ + Portrait von Heribert Innoq + +
-
- - Portrait von Heribert Innoq - -
+
+ + Portrait von Heribert Innoq + +
-
- - Portrait von Heribert Innoq - -
+
+ + Portrait von Heribert Innoq +
+ diff --git a/components/01-atoms/media/favicon/favicon-blue/favicon-blue.html b/components/01-atoms/media/favicon/favicon-blue/favicon-blue.html deleted file mode 100644 index 4ebf2e153..000000000 --- a/components/01-atoms/media/favicon/favicon-blue/favicon-blue.html +++ /dev/null @@ -1,18 +0,0 @@ -
- - - - - - - - - - - - - - - - -
diff --git a/components/01-atoms/media/favicon/favicon-red/favicon-red.html b/components/01-atoms/media/favicon/favicon-red/favicon-red.html deleted file mode 100644 index 55ebc2695..000000000 --- a/components/01-atoms/media/favicon/favicon-red/favicon-red.html +++ /dev/null @@ -1,18 +0,0 @@ -
- - - - - - - - - - - - - - - - -
diff --git a/components/01-atoms/media/figure/_figure.scss b/components/01-atoms/media/figure/_figure.scss index 244a43080..8ecf42b67 100644 --- a/components/01-atoms/media/figure/_figure.scss +++ b/components/01-atoms/media/figure/_figure.scss @@ -1,5 +1,5 @@ figure { - margin: 0 0 $content-spacer-base; + margin: 0 0 $spacer-md; // Short figcaptions will be centered, long ones left aligned text-align: center; @@ -15,15 +15,15 @@ figcaption { display: inline-block; // Short figcaptions will be centered, long ones left aligned text-align: left; - line-height: $figcaption-line-height-small; - font-size: $figcaption-font-size-small; + line-height: $paragraph-line-height-sm; + font-size: $font-size-xxs; } @media screen and (min-width: $grid-breakpoint-md) { figcaption { - line-height: $figcaption-line-height; - font-size: $figcaption-font-size; + line-height: $paragraph-line-height-sm; + font-size: $font-size-base; } } diff --git a/components/01-atoms/media/icon/_icon.scss b/components/01-atoms/media/icon/_icon.scss index f9fcd1990..f40e7dcd3 100644 --- a/components/01-atoms/media/icon/_icon.scss +++ b/components/01-atoms/media/icon/_icon.scss @@ -1,4 +1,4 @@ - // sass-lint:disable no-vendor-prefixes, pseudo-element, empty-line-between-blocks +// sass-lint:disable no-vendor-prefixes, pseudo-element, empty-line-between-blocks // icon font %icon, @@ -7,8 +7,8 @@ top: 2px; text-transform: none; line-height: 1; - font-family: 'icons'; - font-size: .8em; + font-family: "icons"; + font-size: 0.8em; font-weight: normal; font-style: normal; font-variant: normal; @@ -133,11 +133,11 @@ } } - // SVG icons // TODO: Clean up svg icon classes after removing icon font .icon-svg { - display: inline-block; + display: inline-flex; + align-self: center; background: $brand-gray; width: $spacer-md; height: $spacer-md; @@ -182,84 +182,96 @@ background: $brand-yellow; } -// Interface Icons -.arrow-right { - position: relative; - top: .1em; - margin-left: $spacer-xs; +//Arrows +.icon-arrow-long-down { + width: 0.75rem; // magic number + height: 4.5rem; // magic number + mask-image: asset-url("icons/arrow-long-down.svg"); + mask-repeat: no-repeat; } -// .icon-arrow-long-down { -// mask: asset-url('icons/arrow-long-down.svg'); -// } -// .icon-arrow-long-right { width: 4.5rem; // magic number - height: .75rem; // magic number - mask: asset-url('icons/arrow-long-right-blue.svg'); + height: 0.75rem; // magic number + mask-image: asset-url("icons/arrow-long-right.svg"); +} + +.icon-arrow-medium-left { + width: 2rem; // magic number + height: 0.75rem; // magic number + mask-image: asset-url("icons/arrow-medium-left-red.svg"); } -// -// .icon-arrow-medium-left { -// mask: asset-url('icons/arrow-medium-left-red.svg'); -// } .icon-arrow-sync { - mask-image: asset-url('icons/arrow-sync.svg'); + mask-image: asset-url("icons/arrow-sync.svg"); } +// Interface Icons .icon-email { - mask-image: asset-url('icons/email.svg'); + mask-image: asset-url("icons/email.svg"); } .icon-feedback { - mask-image: asset-url('icons/feedback.svg'); + mask-image: asset-url("icons/feedback.svg"); +} + +.icon-minus { + width: 1rem; // magic number + height: 0.5rem; // magic number + mask-image: asset-url("icons/minus-red.svg"); +} + +.icon-plus { + width: 1rem; // magic number + height: 1rem; // magic number + mask-image: asset-url("icons/plus-red.svg"); } .icon-text { - mask-image: asset-url('icons/text.svg'); + mask-image: asset-url("icons/text.svg"); } // Logos .icon-apple-itunes { - mask-image: asset-url('icons/apple-itunes.svg'); + mask-image: asset-url("icons/apple-itunes.svg"); } .icon-facebook { - mask-image: asset-url('icons/facebook.svg'); + mask-image: asset-url("icons/facebook.svg"); } .icon-leanpub { - mask-image: asset-url('icons/leanpub.svg'); + mask-image: asset-url("icons/leanpub.svg"); } .icon-github { - mask-image: asset-url('icons/github.svg'); + mask-image: asset-url("icons/github.svg"); } .icon-linkedin { - mask-image: asset-url('icons/linkedin.svg'); + mask-image: asset-url("icons/linkedin.svg"); } .icon-rss { - mask-image: asset-url('icons/rss-boxed.svg'); + mask-image: asset-url("icons/rss-boxed.svg"); } .icon-rss-1 { - mask-image: asset-url('icons/rss.svg'); + mask-image: asset-url("icons/rss.svg"); } .icon-spotify { - mask-image: asset-url('icons/spotify.svg'); + mask-image: asset-url("icons/spotify.svg"); } .icon-twitter { - mask-image: asset-url('icons/twitter.svg'); + mask-image: asset-url("icons/twitter.svg"); } .icon-xing { - mask-image: asset-url('icons/xing.svg'); + mask-image: asset-url("icons/xing.svg"); } .icon-youtube { - mask-image: asset-url('icons/youtube.svg'); + mask-image: asset-url("icons/youtube.svg"); } diff --git a/components/01-atoms/media/icon/icon.config.yml b/components/01-atoms/media/icon/icon.config.yml index df0aed805..c9f4a5954 100644 --- a/components/01-atoms/media/icon/icon.config.yml +++ b/components/01-atoms/media/icon/icon.config.yml @@ -1 +1 @@ -status: ready +status: wip diff --git a/components/01-atoms/media/icon/icon.html b/components/01-atoms/media/icon/icon.html index 4cd43b10c..f5b0503c6 100644 --- a/components/01-atoms/media/icon/icon.html +++ b/components/01-atoms/media/icon/icon.html @@ -5,9 +5,19 @@

SVG icon Overview

Arrows

- + + + + + + + + + + + @@ -19,17 +29,23 @@

Arrows

+ + +

Interface Icons

- - - - - - - - + + + + + + + + + + +

Logos

diff --git a/components/01-atoms/media/logo/logo.html b/components/01-atoms/media/logo/logo.html index c3453ed76..8d4c726ea 100644 --- a/components/01-atoms/media/logo/logo.html +++ b/components/01-atoms/media/logo/logo.html @@ -1,23 +1,47 @@ -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
+

Edition 02

+
+
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+ + +

Edition 01

+
+ +
+
+ +
+
+ +
+
+ +
+ +

Monochrome

+
+ +
+
+ +
+
+ +
+ diff --git a/components/01-atoms/text/block/code/_code.scss b/components/01-atoms/text/block/code/_code.scss index 95a23c877..3b7174026 100644 --- a/components/01-atoms/text/block/code/_code.scss +++ b/components/01-atoms/text/block/code/_code.scss @@ -3,17 +3,9 @@ pre > code { display: block; margin-bottom: $spacer-base; - border-right: 2px solid $code-snippet-border-color; background-color: $code-background-color; padding: $spacer-xs $spacer-xs $spacer-xs $spacer-md; overflow: auto; - line-height: $code-snippet-line-height-small; - font-size: $code-snippet-font-size-small; -} - -@media screen and (min-width: $grid-breakpoint-md) { - pre > code { - line-height: $code-snippet-line-height; - font-size: $code-snippet-font-size; - } + line-height: $paragraph-line-height; + font-size: $font-size-xs; } diff --git a/components/01-atoms/text/block/date/_date.scss b/components/01-atoms/text/block/date/_date.scss index 78c1d735e..ef3a3e063 100644 --- a/components/01-atoms/text/block/date/_date.scss +++ b/components/01-atoms/text/block/date/_date.scss @@ -1,9 +1,7 @@ -$event-date-section-height: ($label-font-size * $label-line-height) + (2 * $spacer-xxs); - .date { @extend %heading-font-bold; - line-height: $date-line-height; - font-size: $date-font-size; + + font-size: $font-size-base; } //Event Date for Teasers @@ -11,7 +9,6 @@ $event-date-section-height: ($label-font-size * $label-line-height) + (2 * $spac display: flex; flex-direction: column; justify-content: space-around; - margin-top: -$event-date-section-height; background-color: $date-section-background-color; } @@ -19,7 +16,7 @@ $event-date-section-height: ($label-font-size * $label-line-height) + (2 * $spac display: flex; flex-direction: row; align-items: center; - justify-content: space-around; + justify-content: space-between; } .event-date { @@ -38,9 +35,8 @@ $event-date-section-height: ($label-font-size * $label-line-height) + (2 * $spac .event-day { @extend %heading-font-heavy; - line-height: $event-day-line-height-small; color: $date-section-day-color; - font-size: $event-day-font-size-small; + font-size: $font-size-lg; } .event-month { @@ -48,9 +44,8 @@ $event-date-section-height: ($label-font-size * $label-line-height) + (2 * $spac margin-bottom: 0; text-transform: uppercase; - line-height: $event-month-line-height-small; color: $date-section-month-color; - font-size: $event-month-font-size-small; + font-size: $font-size-xs; } .event-year { @@ -59,9 +54,8 @@ $event-date-section-height: ($label-font-size * $label-line-height) + (2 * $spac margin-left: $spacer-xs; border-left: 1px solid $date-section-year-color; padding-left: $spacer-xxs; - line-height: $event-year-line-height; color: $date-section-year-color; - font-size: $event-year-font-size; + font-size: $font-size-xs; } .event-date-separator { @@ -73,7 +67,6 @@ $event-date-section-height: ($label-font-size * $label-line-height) + (2 * $spac // Breakpoints @media screen and (min-width: $grid-breakpoint-md) { - .event-date-section { margin-top: 0; width: 80px; @@ -88,14 +81,12 @@ $event-date-section-height: ($label-font-size * $label-line-height) + (2 * $spac } .event-day { - line-height: $event-day-line-height; - font-size: $event-day-font-size; + font-size: $font-size-xl; } .event-month { margin-bottom: $spacer-xxs; - line-height: $event-month-line-height; - font-size: $event-month-font-size; + font-size: $font-size-base; } .event-year { @@ -103,8 +94,7 @@ $event-date-section-height: ($label-font-size * $label-line-height) + (2 * $spac border-top: 1px solid $date-section-year-color; border-left: 0; padding-left: 0; - line-height: $event-year-line-height; - font-size: $event-year-font-size; + font-size: $font-size-xs; } .event-date-separator { diff --git a/components/01-atoms/text/block/duration/_duration.scss b/components/01-atoms/text/block/duration/_duration.scss index 1ad945a06..ee306e7ce 100644 --- a/components/01-atoms/text/block/duration/_duration.scss +++ b/components/01-atoms/text/block/duration/_duration.scss @@ -1,5 +1,5 @@ .duration { @extend %body-font-italic; - line-height: $date-line-height; - font-size: $duration-font-size; + + font-size: $font-size-sm; } diff --git a/components/01-atoms/text/block/edition/_edition.scss b/components/01-atoms/text/block/edition/_edition.scss index b7538dae5..e2c703e6a 100644 --- a/components/01-atoms/text/block/edition/_edition.scss +++ b/components/01-atoms/text/block/edition/_edition.scss @@ -1,73 +1,86 @@ -$event-date-section-height: ($label-font-size * $label-line-height) + (2 * $spacer-xxs); - - +$edition-font-size: $font-size-base; //Edition Label for Artist Collabo .edition-section { - @extend %heading-font-bold; display: flex; flex-direction: column; + align-items: center; justify-content: space-around; - margin-right: auto; - margin-left: auto; - max-width: 250px; + margin-bottom: $spacer-sm; text-align: center; - } .edition-separator { transform: rotate(90deg); - margin-top: $spacer-xl; + margin-bottom: $spacer-lg; border: 0; background-color: $brand-gray; - width: 3 * $spacer-base; + width: $spacer-xl; height: 1px; } .edition { - margin-top: $spacer-xl; + @extend %heading-font-bold; + + margin-bottom: $spacer-xs; text-transform: uppercase; - line-height: $edition-line-height; - font-size: $edition-font-size; + color: $brand-gray; + font-size: $font-size-md; } .edition-date { + @extend %heading-font-heavy; + display: flex; flex-direction: column; align-items: center; - margin-bottom: $spacer-md; - padding: $spacer-sm $spacer-xl 0; - font-size: 1.5 * $edition-font-size; + font-size: $font-size-xxl; + + &--edition-1 { + color: $brand-blue; + } + + &--edition-2 { + color: $brand-petrol; + } } .edition-date-separator { transform: rotate(90deg); margin: $spacer-sm 0; border: 0; - background-color: $artwork-title-color; + background-color: $brand-red; min-width: $spacer-base; height: 5px; - &--variant { - background-color: $artwork-title-color--variant; + &--edition-2 { + background-color: $brand-apricot; } } - - - // Breakpoints @media screen and (min-width: $grid-breakpoint-md) { + .edition-section { + margin-bottom: $spacer-xxs; + } + + .edition { + font-size: $font-size-lg; + } + + .edition-separator { + margin-bottom: $spacer-xl; + width: ms(20); + } .edition-date { flex-direction: row; - font-size: 2 * $edition-font-size; - + font-size: $font-size-xxxxl; } .edition-date-separator { transform: rotate(0deg); - margin: 0 $spacer-xs; - + margin: 0 $spacer-xxs; + height: 8px; } } diff --git a/components/01-atoms/text/block/edition/edition.html b/components/01-atoms/text/block/edition/edition.html index 860452523..796532d66 100644 --- a/components/01-atoms/text/block/edition/edition.html +++ b/components/01-atoms/text/block/edition/edition.html @@ -1,21 +1,19 @@ -
- Time period of artist edition
-
-
-
-
Edition
- 18 -
- 19 -
-
+Time period of artist edition
+
+
+
+
Edition
+ 18 +
+ 19 +
+
-
-
-
Edition
- 20 -
- 21 -
-
+
+
+
Edition
+ 20 +
+ heute +
diff --git a/components/01-atoms/text/block/footnote/_footnote.scss b/components/01-atoms/text/block/footnote/_footnote.scss index 8412cfff9..e51be93c1 100644 --- a/components/01-atoms/text/block/footnote/_footnote.scss +++ b/components/01-atoms/text/block/footnote/_footnote.scss @@ -17,8 +17,8 @@ @extend %heading-font-regular; margin-bottom: $spacer-sm; - line-height: $footnote-line-height-small; - font-size: $footnote-font-size-small; + line-height: $paragraph-line-height; + font-size: $font-size-xxs; } li { @@ -39,6 +39,7 @@ left: -.5rem; width: $spacer-sm; text-align: right; + color: $footnote-index-color; content: counter(number); counter-increment: number; } @@ -54,8 +55,7 @@ & p { @extend %heading-font-regular; margin: 0; - line-height: $tooltip-line-height-small; - font-size: $tooltip-font-size-small; + font-size: $font-size-xxs; } } @@ -64,8 +64,7 @@ .footnotes__list { li, li > p { - line-height: $footnote-line-height; - font-size: $footnote-font-size; + font-size: $font-size-base; } } @@ -73,8 +72,7 @@ max-width: 40%; & p { - line-height: $tooltip-line-height; - font-size: $tooltip-font-size; + font-size: $font-size-base; } } } diff --git a/components/01-atoms/text/block/heading/_heading.scss b/components/01-atoms/text/block/heading/_heading.scss index ab48bee60..6bdd2e2d7 100644 --- a/components/01-atoms/text/block/heading/_heading.scss +++ b/components/01-atoms/text/block/heading/_heading.scss @@ -7,11 +7,12 @@ h1 { @extend %heading-font-heavy; @extend %manual-hyphenation; + margin-top: 0; margin-bottom: $spacer-lg; - line-height: $h1-line-height; + line-height: $heading-line-height; color: $h1-color; - font-size: $h1-font-size-small; + font-size: $font-size-xl; } // H2 @@ -19,11 +20,12 @@ h1 { h2 { @extend %heading-font-heavy; @extend %manual-hyphenation; + margin-top: 0; margin-bottom: $spacer-base; - line-height: $h2-line-height; + line-height: $heading-line-height; color: $h2-color; - font-size: $h2-font-size-small; + font-size: $font-size-lg; } // H3 @@ -31,11 +33,12 @@ h2 { h3 { @extend %heading-font-heavy; @extend %manual-hyphenation; + margin-top: 0; margin-bottom: $spacer-md; - line-height: $h3-line-height; + line-height: $heading-line-height; color: $h3-color; - font-size: $h3-font-size-small; + font-size: $font-size-md; } // H4 @@ -43,11 +46,12 @@ h3 { h4 { @extend %heading-font-bold; @extend %manual-hyphenation; + margin-top: 0; margin-bottom: $spacer-sm; - line-height: $h4-line-height; + line-height: $heading-line-height; color: $h4-color; - font-size: $h4-font-size-small; + font-size: $font-size-sm; } // H5 @@ -55,11 +59,12 @@ h4 { h5 { @extend %heading-font-bold; @extend %manual-hyphenation; + margin-top: 0; margin-bottom: $spacer-xs; - line-height: $h5-line-height; + line-height: $heading-line-height; color: $h5-color; - font-size: $h5-font-size-small; + font-size: $font-size-base; } // H6 @@ -67,14 +72,14 @@ h5 { h6 { @extend %heading-font-heavy; @extend %manual-hyphenation; + margin-top: 0; margin-bottom: $spacer-xs; - line-height: $h6-line-height; + line-height: $heading-line-height; color: $h6-color; - font-size: $h6-font-size-small; + font-size: $font-size-base; } - // Remove links stylings inside headlines h1, h2, @@ -89,25 +94,25 @@ h6 { .teaser-section-heading { @extend %h2; + margin: 0 auto $spacer-base; text-align: center; text-transform: uppercase; - line-height: $teaser-section-heading-line-height-small; - font-size: $teaser-section-heading-font-size-small; + font-size: $font-size-lg; } .upcase-heading { @extend %h5; + margin: 0 auto $spacer-md; text-transform: uppercase; - line-height: $teaser-section-heading-line-height-small; - font-size: $teaser-section-heading-font-size-small; + font-size: $font-size-xxl; } // Prevent older Browsers from screwing up with max-content widths @supports (width: max-content) { .teaser-section-heading { - border-bottom: 4px solid $brand-text; + border-bottom: 4px solid $teaser-section-heading-border-color; width: max-content; } @@ -130,7 +135,7 @@ h6 { @extend %h3; margin-bottom: $spacer-sm; - border-top: 8px solid $brand-interaction; + border-top: 8px solid $section-heading-border-color; padding-top: $spacer-sm; } @@ -143,48 +148,35 @@ h6 { @media screen and (min-width: $grid-breakpoint-md) { %h1, h1 { - line-height: $h1-line-height; - font-size: $h1-font-size; + font-size: $font-size-xxxl; } // H2 %h2, h2 { - line-height: $h2-line-height; - font-size: $h2-font-size; + font-size: $font-size-xl; } // H3 %h3, h3 { - line-height: $h3-line-height; - font-size: $h3-font-size; + font-size: $font-size-lg; } // H4 %h4, h4 { - line-height: $h4-line-height; - font-size: $h4-font-size; + font-size: $font-size-md; } // H5 %h5, h5 { - line-height: $h5-line-height; - font-size: $h5-font-size; - } - - // H6 - %h6, - h6 { - line-height: $h6-line-height; - font-size: $h6-font-size; + font-size: $font-size-sm; } .teaser-section-heading { margin-bottom: $spacer-lg; - line-height: $teaser-section-heading-line-height; - font-size: $teaser-section-heading-font-size; + font-size: $font-size-xxl; } } diff --git a/components/01-atoms/text/block/label/_label.scss b/components/01-atoms/text/block/label/_label.scss index 275b166c1..78d7192eb 100644 --- a/components/01-atoms/text/block/label/_label.scss +++ b/components/01-atoms/text/block/label/_label.scss @@ -1,8 +1,7 @@ .label { display: inline-block; padding: $spacer-xxs; - line-height: $label-line-height-small; - font-size: $label-font-size-small; + font-size: $font-size-xs; &.talk { @extend %heading-font-bold; @@ -33,8 +32,7 @@ .label-big { display: inline-block; padding: $spacer-xs; - line-height: $label-big-line-height; - font-size: $label-big-font-size; + font-size: $font-size-base; &.hint { @extend %heading-font-bold; @@ -55,15 +53,13 @@ &.badge--inverted { background-color: $badge-background-color-inverted; + color: $badge-text-color-inverted; } } - //Breakpoints @media screen and (min-width: $grid-breakpoint-md) { .label { margin-right: $spacer-xxs; - line-height: $label-line-height; - font-size: $label-font-size; } } diff --git a/components/01-atoms/text/block/label/label.html b/components/01-atoms/text/block/label/label.html index 5ca6b5965..e04b48af7 100644 --- a/components/01-atoms/text/block/label/label.html +++ b/components/01-atoms/text/block/label/label.html @@ -1,18 +1,28 @@ -
- Vortrag -
-
- Training -
-
- Folien verfügbar -
-
- Ausverkauft! -
-
- Neu! -
-
- Neu. + +
+
+ Vortrag +
+ +
+ Training +
+ +
+ Folien verfügbar +
+ +
+ Ausverkauft! +
+ +
+ Neu! +
+ +
+ Neu. +
+ + diff --git a/components/01-atoms/text/block/list/_checked-list.scss b/components/01-atoms/text/block/list/_checked-list.scss index 417f2d584..0478b8577 100644 --- a/components/01-atoms/text/block/list/_checked-list.scss +++ b/components/01-atoms/text/block/list/_checked-list.scss @@ -9,8 +9,9 @@ $list-indent: $spacer-xs + $spacer-sm; &::before { @extend %icon; + position: absolute; - top: .45em; + top: 0.45em; left: 0; color: $bullet-list-color; content: $icon-check; diff --git a/components/01-atoms/text/block/list/_ordered-list.scss b/components/01-atoms/text/block/list/_ordered-list.scss index ab3ea33ad..9f356785b 100644 --- a/components/01-atoms/text/block/list/_ordered-list.scss +++ b/components/01-atoms/text/block/list/_ordered-list.scss @@ -14,14 +14,14 @@ ol:not([class]) { @extend %body-font-regular; @include list-unstyled; - margin-bottom: $content-spacer-base; + margin-bottom: $spacer-md; line-height: $paragraph-line-height; - font-size: $paragraph-font-size-small; + font-size: $font-size-base; counter-reset: number; @media screen and (min-width: $grid-breakpoint-md) { line-height: $paragraph-line-height; - font-size: $paragraph-font-size; + font-size: $font-size-sm; } & > li { @@ -33,19 +33,20 @@ ol:not([class]) { @extend %heading-font-bold; position: absolute; - top: -.2rem; - left: -.5rem; + top: -0.2rem; + left: -0.5rem; width: $number-space; text-align: right; line-height: $paragraph-line-height; - font-size: $paragraph-font-size-small; + color: $bullet-list-color-secondary; + font-size: $font-size-base; content: counter(number); counter-increment: number; @media screen and (min-width: $grid-breakpoint-md) { - top: -.23rem; + top: -0.23rem; line-height: $paragraph-line-height; - font-size: $paragraph-font-size; + font-size: $font-size-sm; } } } @@ -55,11 +56,11 @@ ol:not([class]) { // to blend into the outer list. margin-top: $spacer-xs; line-height: $paragraph-line-height; - font-size: $paragraph-font-size-small; + font-size: $font-size-base; @media screen and (min-width: $grid-breakpoint-md) { line-height: $paragraph-line-height; - font-size: $paragraph-font-size; + font-size: $font-size-sm; } &, diff --git a/components/01-atoms/text/block/list/_tuple-list.scss b/components/01-atoms/text/block/list/_tuple-list.scss index dbbd2a0d0..09e2586b8 100644 --- a/components/01-atoms/text/block/list/_tuple-list.scss +++ b/components/01-atoms/text/block/list/_tuple-list.scss @@ -6,7 +6,9 @@ $tuple-list-label-width: 8rem; .tuple-list__label { @extend %teaser-caption; + display: block; + color: $tupel-list-label-color; } .tuple-list__entry { @@ -14,8 +16,9 @@ $tuple-list-label-width: 8rem; } .tuple-list__value { + @extend %heading-font-regular; + display: block; - font-family: $font-family-sans-serif; } @media screen and (min-width: $grid-breakpoint-md) { @@ -24,7 +27,7 @@ $tuple-list-label-width: 8rem; margin-bottom: $spacer-xxs; grid-template-columns: $tuple-list-label-width auto; grid-template-rows: auto; - grid-template-areas: 'label value'; + grid-template-areas: "label value"; } .tuple-list__label { diff --git a/components/01-atoms/text/block/list/_unordered-list.scss b/components/01-atoms/text/block/list/_unordered-list.scss index f5274db8e..85949e181 100644 --- a/components/01-atoms/text/block/list/_unordered-list.scss +++ b/components/01-atoms/text/block/list/_unordered-list.scss @@ -22,16 +22,16 @@ ul:not([class]), &::before { position: absolute; - top: .4rem; //magic number + top: 0.4rem; //magic number left: 0; border-radius: 50%; - background: $bullet-list-color; + background: $bullet-list-color-primary; width: $bullet-size; height: $bullet-size; - content: ''; + content: ""; @media screen and (min-width: $grid-breakpoint-md) { - top: .5rem; //magic number + top: 0.5rem; //magic number } } } @@ -48,13 +48,11 @@ ul:not([class]), // Change bullet appeareance in nested contexts li::before { - border: 1px solid $bullet-list-color; - background: $bullet-list-bg-color; + background: $bullet-list-color-secondary; } } } - // ---- Bold Bullet Lists ---------------------------------------------------------- // .bold-list { @@ -62,10 +60,10 @@ ul:not([class]), & > li { &::before { - top: .59rem; //magic number + top: 0.59rem; //magic number @media screen and (min-width: $grid-breakpoint-md) { - top: .73rem; //magic number + top: 0.73rem; //magic number } } } diff --git a/components/01-atoms/text/block/paragraph/_paragraph.scss b/components/01-atoms/text/block/paragraph/_paragraph.scss index 93a9d0164..49b2175d5 100644 --- a/components/01-atoms/text/block/paragraph/_paragraph.scss +++ b/components/01-atoms/text/block/paragraph/_paragraph.scss @@ -1,9 +1,9 @@ p { @extend %body-font-regular; - margin-top: 0; - margin-bottom: $content-spacer-base; - line-height: $paragraph-line-height-small; - font-size: $paragraph-font-size-small; + + margin-bottom: $spacer-md; + line-height: $paragraph-line-height; + font-size: $font-size-base; &:not([class]) { @extend %improved-hyphenation-text; @@ -11,16 +11,18 @@ p { &.lead { @extend %body-font-italic; - line-height: $paragraph-lead-line-height-small; - font-size: $paragraph-lead-font-size-small; + + line-height: $paragraph-line-height; + font-size: $font-size-sm; } &.display, &.standalone { @extend %heading-font-regular; + margin-bottom: 0; - line-height: $paragraph-line-height-small; - font-size: $paragraph-font-size-small; + line-height: $paragraph-line-height; + font-size: $font-size-base; } &.display { @@ -30,12 +32,10 @@ p { @media screen and (min-width: $grid-breakpoint-md) { p { - line-height: $paragraph-line-height; - font-size: $paragraph-font-size; + font-size: $font-size-sm; &.lead { - line-height: $paragraph-lead-line-height; - font-size: $paragraph-lead-font-size; + font-size: $font-size-md; } } } diff --git a/components/01-atoms/text/block/quote/_block-quote.scss b/components/01-atoms/text/block/quote/_block-quote.scss index 1072b0bc1..8836d2bbe 100644 --- a/components/01-atoms/text/block/quote/_block-quote.scss +++ b/components/01-atoms/text/block/quote/_block-quote.scss @@ -7,13 +7,13 @@ blockquote:not([class]), .blockquote { position: relative; - margin: 0 0 $content-spacer-base; + margin: 0 0 $spacer-md; &, & > p { @extend %body-font-italic; - line-height: $base-line-height; - font-size: $paragraph-font-size; + line-height: $paragraph-line-height; + font-size: $font-size-sm; } @media screen and (min-width: $grid-breakpoint-md) { @@ -25,7 +25,7 @@ blockquote:not([class]), left: -$spacer-lg; background-color: $quote-color; width: 10px; - content: ''; + content: ""; } } } diff --git a/components/01-atoms/text/block/quote/_pull-quote.scss b/components/01-atoms/text/block/quote/_pull-quote.scss index 4ce414e65..cbeaddfc0 100644 --- a/components/01-atoms/text/block/quote/_pull-quote.scss +++ b/components/01-atoms/text/block/quote/_pull-quote.scss @@ -2,8 +2,7 @@ // pull-quote > blockquote, .pullquote { - - margin: 0 0 $content-spacer-base; + margin: 0 0 $spacer-md; border: 1px solid $pull-quote-border-color; border-width: 1px 0; padding: $spacer-sm; @@ -13,9 +12,9 @@ pull-quote > blockquote, @extend %heading-font-bold; text-align: center; - line-height: $pull-quote-line-height; + line-height: $paragraph-line-height; color: $pull-quote-color; - font-size: $pull-quote-font-size; + font-size: $font-size-sm; } & > p { @@ -26,7 +25,7 @@ pull-quote > blockquote, @media screen and (min-width: $grid-breakpoint-md) { pull-quote > blockquote, .pullquote { - margin: 0 auto $content-spacer-base; + margin: 0 auto $spacer-md; width: 80%; } } diff --git a/components/01-atoms/text/block/table/_table.scss b/components/01-atoms/text/block/table/_table.scss index 7e47bc96c..67958616e 100644 --- a/components/01-atoms/text/block/table/_table.scss +++ b/components/01-atoms/text/block/table/_table.scss @@ -9,9 +9,9 @@ caption { @extend %heading-font-regular; + margin-top: $spacer-xxs; caption-side: bottom; - line-height: $figcaption-line-height; - font-size: $figcaption-font-size; + font-size: $font-size-xs; } thead, @@ -19,9 +19,8 @@ @extend %heading-font-bold; background-color: $table-header-background-color; - line-height: $content-table-head-line-height-small; color: $table-header-text-color; - font-size: $content-table-head-font-size-small; + font-size: $font-size-base; th { padding: $spacer-sm $spacer-xs; @@ -44,31 +43,20 @@ padding: $spacer-xs; vertical-align: top; - line-height: $content-table-body-line-height-small; - font-size: $content-table-body-font-size-small; + + font-size: $font-size-xs; } } -@media screen and (min-width: $grid-breakpoint-md) { +@media screen and (min-width: $grid-breakpoint-md) { .table { margin-bottom: $spacer-sm; - - thead, - tfoot { - line-height: $content-table-head-line-height; - font-size: $content-table-head-font-size; - } - - td { - line-height: $content-table-body-line-height; - font-size: $content-table-body-font-size; - } } } // Responsive tables code taken from BS4 // sass-lint:disable no-vendor-prefixes -@media screen and (max-width: $grid-breakpoint-sm) { +@media screen and (max-width: $grid-breakpoint-sm) { .table { display: block; width: 100%; diff --git a/components/01-atoms/text/block/tag-list/_tag-list.scss b/components/01-atoms/text/block/tag-list/_tag-list.scss index cfb6f8fd3..5f05531d4 100644 --- a/components/01-atoms/text/block/tag-list/_tag-list.scss +++ b/components/01-atoms/text/block/tag-list/_tag-list.scss @@ -15,15 +15,15 @@ @extend %heading-font-bold; display: inline-block; - transition: .2s background-color ease-in-out; + transition: 0.2s background-color ease-in-out; background: $tag-background-color; padding: $spacer-xs $spacer-sm; text-transform: lowercase; text-decoration: none; - line-height: $tag-line-height-small; + color: $tag-text-color; - font-size: $tag-font-size-small; + font-size: $font-size-base; &:hover { background-color: $tag-background-color-hover; @@ -35,9 +35,4 @@ .tag-list__item { margin: $spacer-xxs; } - - .tag-list__link { - line-height: $tag-line-height; - font-size: $tag-font-size; - } } diff --git a/components/01-atoms/text/inline/accentuation/_accentuation.scss b/components/01-atoms/text/inline/accentuation/_accentuation.scss index a4d2ab538..9f97be8c3 100644 --- a/components/01-atoms/text/inline/accentuation/_accentuation.scss +++ b/components/01-atoms/text/inline/accentuation/_accentuation.scss @@ -4,8 +4,7 @@ code { display: inline-block; background-color: $code-background-color; padding: 2px $spacer-xxs; - line-height: $code-line-height; - font-size: $code-font-size; + font-size: $font-size-xs; } mark { diff --git a/components/01-atoms/text/inline/link/_link.scss b/components/01-atoms/text/inline/link/_link.scss index 88a19dfd0..07b44f24e 100644 --- a/components/01-atoms/text/inline/link/_link.scss +++ b/components/01-atoms/text/inline/link/_link.scss @@ -2,11 +2,11 @@ // Default Link - used on all class-less link elements // -$hover-padding: .1em; +$hover-padding: 0.1em; .link-default, a:not([class]) { - transition: standard-transition(padding-bottom, padding-top, background-color); + transition: standard-transition(background-color); border-bottom: 1px solid $link-color; text-decoration: none; color: $link-color; @@ -15,11 +15,9 @@ a:not([class]) { &:hover { outline: none; background-color: $link-hover-color-light; - padding-top: $hover-padding; - padding-bottom: $hover-padding; } - &[href='mailto'] { + &[href="mailto"] { hyphens: none; } } @@ -27,8 +25,9 @@ a:not([class]) { .link--muted { @extend %heading-font-bold; @extend %link-unstyled; + color: $brand-muted; - font-size: $link-teaser-font-size; + font-size: $font-size-xs; } .link-teaser { @@ -37,9 +36,8 @@ a:not([class]) { border-bottom: 3px solid $link-teaser-border-color; padding-bottom: 2px; - line-height: $link-teaser-line-height; color: $link-teaser-text-color; - font-size: $link-teaser-font-size; + font-size: $font-size-xs; &.inverted-text-color { border-bottom: 3px solid $link-teaser-inverted-text-border-color; diff --git a/components/01-atoms/text/inline/link/link.html b/components/01-atoms/text/inline/link/link.html index 6bc2718fe..afe156741 100644 --- a/components/01-atoms/text/inline/link/link.html +++ b/components/01-atoms/text/inline/link/link.html @@ -11,7 +11,7 @@

-

Mehr erfahren

-

Mehr erfahren

+

Link Teaser inverted

+

Link Teaser inverted

diff --git a/components/01-atoms/togglers/collapse-toggler/_collapse-toggler.scss b/components/01-atoms/togglers/collapse-toggler/_collapse-toggler.scss index a7aa309e1..2c18aacaf 100644 --- a/components/01-atoms/togglers/collapse-toggler/_collapse-toggler.scss +++ b/components/01-atoms/togglers/collapse-toggler/_collapse-toggler.scss @@ -1,6 +1,7 @@ .collapse-toggler { @extend %heading-font-heavy; @extend %link-unstyled; + cursor: pointer; .collapse-toggler__flop { diff --git a/components/01-atoms/togglers/multi-toggler/multi-toggler.html b/components/01-atoms/togglers/multi-toggler/multi-toggler.html index 678801f35..394bcb972 100644 --- a/components/01-atoms/togglers/multi-toggler/multi-toggler.html +++ b/components/01-atoms/togglers/multi-toggler/multi-toggler.html @@ -1,8 +1,7 @@ -
- - Multi-Toggler - -

- Consectetur nisi officia sit eu nisi. Deserunt occaecat in sunt ullamco culpa est in consectetur laboris anim culpa duis. Occaecat ullamco pariatur mollit enim laboris duis. Qui laborum sunt adipisicing aliqua consequat voluptate fugiat commodo eiusmod voluptate. -

-
+ + + Multi-Toggler + +

+ Consectetur nisi officia sit eu nisi. Deserunt occaecat in sunt ullamco culpa est in consectetur laboris anim culpa duis. Occaecat ullamco pariatur mollit enim laboris duis. Qui laborum sunt adipisicing aliqua consequat voluptate fugiat commodo eiusmod voluptate. +

diff --git a/components/01-atoms/visual-elements/animation/waiting-dots/_waiting-dots.scss b/components/01-atoms/visual-elements/animation/waiting-dots/_waiting-dots.scss index a0a3644f1..103bee814 100644 --- a/components/01-atoms/visual-elements/animation/waiting-dots/_waiting-dots.scss +++ b/components/01-atoms/visual-elements/animation/waiting-dots/_waiting-dots.scss @@ -9,12 +9,11 @@ background: none; width: 50px; height: 20px; - } .duo, .dot { - animation-duration: .8s; + animation-duration: 0.8s; animation-timing-function: ease-in-out; animation-iteration-count: infinite; } @@ -27,10 +26,9 @@ animation-name: onOff; animation-direction: reverse; opacity: 0; - } + } } - .duo2 { left: 30px; animation-name: spin; @@ -38,18 +36,15 @@ .dot-b { animation-name: onOff; - } + } } - .dot { position: absolute; border-radius: 10px; - background: $brand-red; + background: $dot-color; width: 20px; height: 20px; - - } .dot-a { @@ -60,7 +55,6 @@ right: 0; } - @keyframes spin { 0% { transform: rotate(0deg); @@ -86,9 +80,9 @@ 50% { opacity: 1; - } + } 100% { opacity: 1; - } + } } diff --git a/components/01-atoms/visual-elements/horizontal-line/_horizontal-line.scss b/components/01-atoms/visual-elements/horizontal-line/_horizontal-line.scss index 8400b10bf..576e18711 100644 --- a/components/01-atoms/visual-elements/horizontal-line/_horizontal-line.scss +++ b/components/01-atoms/visual-elements/horizontal-line/_horizontal-line.scss @@ -1,5 +1,5 @@ hr { - margin-bottom: $content-spacer-base; //FIME We need a page layout that manages all horizontal spacingsrg + margin-bottom: $spacer-md; //FIME We need a page layout that manages all horizontal spacingsrg border: 0; background-color: $horizontal-line-color; height: 3px; diff --git a/components/02-molecules/article&blog-post-elements/author-bio/_author-bio.scss b/components/02-molecules/article&blog-post-elements/author-bio/_author-bio.scss index 029127644..26e239233 100644 --- a/components/02-molecules/article&blog-post-elements/author-bio/_author-bio.scss +++ b/components/02-molecules/article&blog-post-elements/author-bio/_author-bio.scss @@ -1,5 +1,6 @@ - // tiny space between name and info -$author-text-margin: .18rem; +$author-bio-image-offset: ms(22) / 2; +// tiny space between name and info +$author-text-margin: 0.18rem; .author-bio { position: relative; @@ -40,7 +41,10 @@ $author-text-margin: .18rem; } .author-bio__name { - @extend %author-name; + @extend %heading-font-bold; + + text-transform: uppercase; + font-size: $font-size-base; } .author-bio__link { @@ -50,7 +54,9 @@ $author-text-margin: .18rem; } .author-bio__info { - @extend %author-role; + @extend %body-font-italic; + + font-size: $font-size-base; .author-bio__name + & { margin-top: $author-text-margin; @@ -69,7 +75,7 @@ $author-text-margin: .18rem; align-items: center; justify-content: center; margin: $spacer-sm auto; - border-top: 1px solid $brand-gray-25; + border-top: 1px solid $author-bio-social-border-color; padding-top: $spacer-sm; } @@ -91,9 +97,8 @@ $author-text-margin: .18rem; @extend %heading-font-regular; @extend %link-unstyled; - margin-bottom: 0; - line-height: $base-line-height; - font-size: $base-font-size; + line-height: $paragraph-line-height; + font-size: $font-size-base; hyphens: none; } diff --git a/components/02-molecules/article&blog-post-elements/author-bio/author-bio-long.html b/components/02-molecules/article&blog-post-elements/author-bio/author-bio-long.html index 77a271ff4..49baa5b5c 100644 --- a/components/02-molecules/article&blog-post-elements/author-bio/author-bio-long.html +++ b/components/02-molecules/article&blog-post-elements/author-bio/author-bio-long.html @@ -1,6 +1,6 @@
- Portrait von Heribert Innoq + Portrait von Heribert Innoq
diff --git a/components/02-molecules/article&blog-post-elements/author-bio/author-bio-short.html b/components/02-molecules/article&blog-post-elements/author-bio/author-bio-short.html index 6c4478e90..d3f990766 100644 --- a/components/02-molecules/article&blog-post-elements/author-bio/author-bio-short.html +++ b/components/02-molecules/article&blog-post-elements/author-bio/author-bio-short.html @@ -2,7 +2,7 @@
@@ -15,7 +15,7 @@
diff --git a/components/02-molecules/article&blog-post-elements/conclusion/_conclusion.scss b/components/02-molecules/article&blog-post-elements/conclusion/_conclusion.scss index c36981417..5586e7f75 100644 --- a/components/02-molecules/article&blog-post-elements/conclusion/_conclusion.scss +++ b/components/02-molecules/article&blog-post-elements/conclusion/_conclusion.scss @@ -1,3 +1,5 @@ +$conclusion-border-size: ms(5); + // // Conclusion // @@ -6,19 +8,17 @@ border-top: $conclusion-border-size solid $conclusion-border-color; border-bottom: $conclusion-border-size solid $conclusion-border-color; background: $conclusion-background-color; - padding: $spacer-lg $container-spacer-x; + padding: $spacer-lg $spacer-base; } .conclusion-headline { - line-height: $conclusion-headline-line-height-small; color: $conclusion-headline-color; - font-size: $conclusion-headline-font-size-small; + font-size: $font-size-xxxl; } .conclusion-subheadline { - line-height: $conclusion-subheadline-line-height-small; color: $conclusion-subheadline-color; - font-size: $conclusion-subheadline-font-size-small; + font-size: $font-size-lg; } .conclusion-text { @@ -26,9 +26,8 @@ & > * { @extend %heading-font-regular; - line-height: $conclusion-text-line-height-small; color: $conclusion-text-color; - font-size: $conclusion-text-font-size-small; + font-size: $font-size-sm; // Remove the margin of the last paragraph inside a conclusion &:last-child { @@ -37,7 +36,13 @@ } a { + border-bottom: 1px solid $conclusion-link-color; color: $conclusion-link-color; + + &:hover { + border-bottom: 1px solid $conclusion-background-color; + color: $conclusion-link-hover-color; + } } } @@ -47,18 +52,11 @@ } .conclusion-headline { - line-height: $conclusion-headline-line-height; - font-size: $conclusion-headline-font-size; + font-size: $font-size-xxxxl; } .conclusion-subheadline { - line-height: $conclusion-subheadline-line-height; - font-size: $conclusion-subheadline-font-size; - } - - .conclusion-text { - line-height: $conclusion-text-line-height; - font-size: $conclusion-text-font-size; + font-size: $font-size-xl; } } diff --git a/components/02-molecules/article&blog-post-elements/content-separator/_content-separator.scss b/components/02-molecules/article&blog-post-elements/content-separator/_content-separator.scss index d4b5ca7d4..939a39585 100644 --- a/components/02-molecules/article&blog-post-elements/content-separator/_content-separator.scss +++ b/components/02-molecules/article&blog-post-elements/content-separator/_content-separator.scss @@ -3,7 +3,7 @@ // // Component specific variables -$border-position: $base-font-size / 2; +$border-position: $font-size-base / 2; // Component definition .content-separator { @@ -19,8 +19,8 @@ $border-position: $base-font-size / 2; // The second box-shadow is 1px taller than the first one, // resulting in a single line. box-shadow: $box-shadow-color-light 0 $border-position 0 0 inset, - $box-shadow-color-dark 0 calc(#{$border-position} + 1px) 0 0 inset; - min-height: $base-font-size; + $box-shadow-color-dark 0 calc(#{$border-position} + 1px) 0 0 inset; + min-height: $font-size-base; } // Both subcomponents overlap the border of its parent component by @@ -31,6 +31,7 @@ $border-position: $base-font-size / 2; padding-right: $spacer-xs; padding-left: $spacer-xs; line-height: 1; + color: $content-seperator-text-color; } .content-separator__date { diff --git a/components/02-molecules/article&blog-post-elements/footnote-section/_footnote-section.scss b/components/02-molecules/article&blog-post-elements/footnote-section/_footnote-section.scss index e6c8eda90..5a6bfe5b9 100644 --- a/components/02-molecules/article&blog-post-elements/footnote-section/_footnote-section.scss +++ b/components/02-molecules/article&blog-post-elements/footnote-section/_footnote-section.scss @@ -8,30 +8,23 @@ justify-content: left; margin-bottom: $spacer-sm; text-transform: uppercase; - line-height: $footnote-section-headline-line-height-small; color: $footnote-section-headline-color; - font-size: $footnote-section-headline-font-size-small; + font-size: $font-size-sm; &::after { position: relative; - top: .65em; + top: 0.65em; flex-grow: 1; margin-left: 10px; background-color: $footnote-section-headline-color; max-width: 80px; height: 3px; - content: '\a0'; + content: "\a0"; } } @media screen and (min-width: $grid-breakpoint-md) { - .footnote-section__headline__container { width: 30%; } - - .footnote-sectiom__headline { - line-height: $footnote-section-headline-line-height; - font-size: $footnote-section-headline-font-size; - } } diff --git a/components/02-molecules/article&blog-post-elements/info-box/info-box.scss b/components/02-molecules/article&blog-post-elements/info-box/info-box.scss index 4326bde10..089095d4f 100644 --- a/components/02-molecules/article&blog-post-elements/info-box/info-box.scss +++ b/components/02-molecules/article&blog-post-elements/info-box/info-box.scss @@ -16,7 +16,7 @@ info-box { } } - &[open='true'] { + &[open="true"] { .infobox__teaser__chevron { &::before { content: $icon-chevron-up; @@ -25,7 +25,7 @@ info-box { } } - &[open='false'] { + &[open="false"] { .infobox__teaser, .infobox__teaser__heading { background-color: $infobox-teaser-background-color-closed; @@ -53,8 +53,8 @@ info-box { display: inline-block; margin: 0; - line-height: $infobox-heading-line-height; - font-size: $infobox-heading-font-size; + + font-size: $font-size-xs; } .infobox__teaser__left, @@ -87,7 +87,6 @@ info-box { & p { @extend %heading-font-regular; - line-height: $infobox-text-line-height; - font-size: $infobox-text-font-size; + font-size: $font-size-base; } } diff --git a/components/02-molecules/article&blog-post-elements/quotes/long-quote/_long-quote.scss b/components/02-molecules/article&blog-post-elements/quotes/long-quote/_long-quote.scss index 7978e7519..aca80ccb1 100644 --- a/components/02-molecules/article&blog-post-elements/quotes/long-quote/_long-quote.scss +++ b/components/02-molecules/article&blog-post-elements/quotes/long-quote/_long-quote.scss @@ -1,32 +1,31 @@ long-quote > blockquote, %longquote, .longquote { - margin-bottom: $content-spacer-base; + margin-bottom: $spacer-md; text-align: center; > p { @extend %heading-font-heavy; - line-height: $longquote-line-height-small; - color: $brand-interaction; - font-size: $longquote-font-size-small; + color: $quote-color; + font-size: $font-size-sm; &:lang(de) { &::before { - content: '„'; + content: "„"; } &::after { - content: '“'; + content: "“"; } } &:lang(en) { &::before { - content: '“'; + content: "“"; } &::after { - content: '”'; + content: "”"; } } } @@ -43,13 +42,18 @@ long-quote > blockquote, %longquote__author, .longquote__author { - @extend %author-name; + @extend %heading-font-bold; + display: block; + text-transform: uppercase; + font-size: $font-size-base; } %longquote__role, .longquote__role { - @extend %author-role; + @extend %body-font-italic; + + font-size: $font-size-base; } %longquote__avatar, @@ -61,8 +65,7 @@ long-quote > blockquote, %longquote, .longquote { > p { - line-height: $longquote-line-height; - font-size: $longquote-font-size; + font-size: $font-size-lg; } } } diff --git a/components/02-molecules/article&blog-post-elements/quotes/long-quote/long-quote.html b/components/02-molecules/article&blog-post-elements/quotes/long-quote/long-quote.html index 1d3c60418..6b9f9227f 100644 --- a/components/02-molecules/article&blog-post-elements/quotes/long-quote/long-quote.html +++ b/components/02-molecules/article&blog-post-elements/quotes/long-quote/long-quote.html @@ -23,7 +23,7 @@ Mit INNOQ Schweiz haben wir einen innovativen Partner gefunden, der uns mit seiner kompetenten Beratung und professionellen Umsetzung eine wichtige Stütze unseres Geschäfts ist. Die Mitarbeiter zeichnen sich durch hohe Flexibilität und Agilität aus. Gepaart mit fundiertem Fachwissen ist es ihnen möglich, auch in hektischen Situationen pragmatische und zielführende Lösungen zu finden.

- Portrait von Heribert Innoq + Portrait von Heribert Innoq
Heribert Innoq Senior Consultant diff --git a/components/02-molecules/article&blog-post-elements/quotes/super-quote/_super-quote.scss b/components/02-molecules/article&blog-post-elements/quotes/super-quote/_super-quote.scss index 2d079c67c..0f3c588fb 100644 --- a/components/02-molecules/article&blog-post-elements/quotes/super-quote/_super-quote.scss +++ b/components/02-molecules/article&blog-post-elements/quotes/super-quote/_super-quote.scss @@ -3,8 +3,7 @@ super-quote > blockquote, @extend %longquote; > p { - line-height: $superquote-line-height-small; - font-size: $superquote-font-size-small; + font-size: $font-size-sm; } } @@ -25,8 +24,7 @@ super-quote > blockquote, @extend %longquote; > p { - line-height: $superquote-line-height; - font-size: $superquote-font-size; + font-size: $font-size-xl; } } } diff --git a/components/02-molecules/article&blog-post-elements/quotes/super-quote/super-quote.html b/components/02-molecules/article&blog-post-elements/quotes/super-quote/super-quote.html index 5d00dc0b4..8ebe02de4 100644 --- a/components/02-molecules/article&blog-post-elements/quotes/super-quote/super-quote.html +++ b/components/02-molecules/article&blog-post-elements/quotes/super-quote/super-quote.html @@ -19,7 +19,7 @@

Wertschöpfung findet statt, wenn unsere Änderung oder das neue Feature in unserem Produktionssystem genutzt wird.

- Portrait von Heribert Innoq + Portrait von Heribert Innoq
Heribert Innoq Senior Consultant diff --git a/components/02-molecules/article&blog-post-elements/reference/_reference.scss b/components/02-molecules/article&blog-post-elements/reference/_reference.scss index 290e718b9..fbaf9d1f1 100644 --- a/components/02-molecules/article&blog-post-elements/reference/_reference.scss +++ b/components/02-molecules/article&blog-post-elements/reference/_reference.scss @@ -21,12 +21,10 @@ margin-right: auto; margin-left: auto; text-align: center; - line-height: $reference-line-height-small; - font-size: $reference-font-size-small; + font-size: $font-size-base; } @media screen and (min-width: $grid-breakpoint-md) { - .reference { margin-bottom: $spacer-lg; } @@ -35,10 +33,4 @@ margin: 0 auto $spacer-base; max-width: 40%; } - - .reference__description { - max-width: 90%; - line-height: $reference-line-height; - font-size: $reference-font-size; - } } diff --git a/components/02-molecules/article&blog-post-elements/reference/reference.html b/components/02-molecules/article&blog-post-elements/reference/reference.html index 20aec50e2..0a65059a2 100644 --- a/components/02-molecules/article&blog-post-elements/reference/reference.html +++ b/components/02-molecules/article&blog-post-elements/reference/reference.html @@ -1,6 +1,6 @@
- Business technology + Business technology

Spicy jalapeno bacon ipsum dolor amet t-bone sirloin culpa, tenderloin tempor ullamco flank rump. Biltong corned beef pork loin et. Labore dolore laborum pork laboris. Do alcatra ball tip consequat venison spare ribs pig. Bresaola boudin chuck, spare ribs officia mollit ut esse est jowl minim. diff --git a/components/02-molecules/article&blog-post-elements/share-section/_share-section.scss b/components/02-molecules/article&blog-post-elements/share-section/_share-section.scss index fee7a0fa3..32ef21c3c 100644 --- a/components/02-molecules/article&blog-post-elements/share-section/_share-section.scss +++ b/components/02-molecules/article&blog-post-elements/share-section/_share-section.scss @@ -22,8 +22,8 @@ $share-section-arrow-size: ms(16); } .share-section__heading { - line-height: $share-section-heading-line-height; - font-size: $share-section-heading-font-size; + color: $sharing-headline-color; + font-size: $font-size-lg; } .share-section__list { diff --git a/components/02-molecules/article&blog-post-elements/share-section/share-section.html b/components/02-molecules/article&blog-post-elements/share-section/share-section.html index ad9b02ce2..2896cd48a 100644 --- a/components/02-molecules/article&blog-post-elements/share-section/share-section.html +++ b/components/02-molecules/article&blog-post-elements/share-section/share-section.html @@ -1,5 +1,5 @@

@@ -43,7 +43,7 @@

Softwarearchitektur und -entwicklung

Der Nutzer steht im Mittelpunkt.
- +
@@ -53,7 +53,7 @@

Digitale Plattformen und Infrastrukturen

Noch in Arbeit.
- +
@@ -68,7 +68,7 @@

Wissenstransfer, Coaching und Trainings

technischen Stand. Und sie teilen gerne ihr Knowhow aus der Praxis.
- +
diff --git a/components/02-molecules/visual-elements/social-media-bar/_social-media-bar.scss b/components/02-molecules/visual-elements/social-media-bar/_social-media-bar.scss index 4869a61ea..b5c0722d9 100644 --- a/components/02-molecules/visual-elements/social-media-bar/_social-media-bar.scss +++ b/components/02-molecules/visual-elements/social-media-bar/_social-media-bar.scss @@ -8,6 +8,11 @@ & + & { margin-left: $spacer-md; } + + .icon-svg:hover, + .icon-svg:focus { + background: $brand-white; + } } .social-media-bar__link { diff --git a/components/02-molecules/visual-elements/teaser/full-width-teaser/default-full-width-teaser/_default-full-width-teaser.scss b/components/02-molecules/visual-elements/teaser/full-width-teaser/default-full-width-teaser/_default-full-width-teaser.scss index ee5eab5c4..deb66c23f 100644 --- a/components/02-molecules/visual-elements/teaser/full-width-teaser/default-full-width-teaser/_default-full-width-teaser.scss +++ b/components/02-molecules/visual-elements/teaser/full-width-teaser/default-full-width-teaser/_default-full-width-teaser.scss @@ -1,6 +1,6 @@ -$default-full-width-teaser-bg-width: 1444px; // Arbitrary value -$default-full-width-teaser-bg-height: 1000px; // Arbitrary value -$default-full-width-teaser-height: ms(38); +$full-width-teaser-bg-width: 1444px; // Arbitrary value +$full-width-teaser-bg-height: 1000px; // Arbitrary value +$full-width-teaser-height: ms(38); .default-full-width-teaser { @extend %page-header; @@ -8,7 +8,7 @@ $default-full-width-teaser-height: ms(38); justify-content: center; width: 100%; max-width: 100%; - min-height: $default-full-width-teaser-height; + min-height: $full-width-teaser-height; &--right-aligned { justify-content: flex-end; @@ -22,7 +22,7 @@ $default-full-width-teaser-height: ms(38); .default-full-width-teaser__wrapper { display: flex; justify-content: flex-start; - padding: $container-spacer-x-sm; + padding: $spacer-sm; } .default-full-width-teaser__body { @@ -30,25 +30,24 @@ $default-full-width-teaser-height: ms(38); flex-basis: 100%; flex-direction: column; justify-content: space-between; - background-color: $default-full-width-teaser-body-bg; + background-color: $full-width-teaser-body-bg; padding: $spacer-base; + color: $full-width-teaser-body-color; } .default-full-width-teaser__text { @extend %teaser-text; + margin-bottom: $spacer-base; - line-height: $big-content-teaser-text-line-height-small; - font-size: $big-content-teaser-text-font-size-small; + font-size: $font-size-xs; hyphens: auto; } .default-full-width-teaser__header { padding-bottom: 0; - color: $default-full-width-teaser-body-color; h2 { - line-height: $h1-line-height; - font-size: $h1-font-size; + font-size: $font-size-xxxl; } .punch-in { @@ -91,8 +90,7 @@ $default-full-width-teaser-height: ms(38); } .default-full-width-teaser__text { - line-height: $big-content-teaser-text-line-height; - font-size: $big-content-teaser-text-font-size; + font-size: $font-size-base; hyphens: none; } diff --git a/components/02-molecules/visual-elements/teaser/full-width-teaser/default-full-width-teaser/default-full-width-teaser.html b/components/02-molecules/visual-elements/teaser/full-width-teaser/default-full-width-teaser/default-full-width-teaser.html index bb1e2dada..c294ef1af 100644 --- a/components/02-molecules/visual-elements/teaser/full-width-teaser/default-full-width-teaser/default-full-width-teaser.html +++ b/components/02-molecules/visual-elements/teaser/full-width-teaser/default-full-width-teaser/default-full-width-teaser.html @@ -1,11 +1,11 @@ -
+
case study
-

+

case study headline eggs

@@ -23,7 +23,7 @@

-
+
diff --git a/components/02-molecules/visual-elements/teaser/list-teaser/abstract-list-teaser/_abstract-list-teaser.scss b/components/02-molecules/visual-elements/teaser/list-teaser/abstract-list-teaser/_abstract-list-teaser.scss index 669fececf..ac1021b34 100644 --- a/components/02-molecules/visual-elements/teaser/list-teaser/abstract-list-teaser/_abstract-list-teaser.scss +++ b/components/02-molecules/visual-elements/teaser/list-teaser/abstract-list-teaser/_abstract-list-teaser.scss @@ -18,6 +18,10 @@ color: $list-teaser-abstract-primary-drop-caps-color; } } + + .author-bio__text { + color: $list-teaser-abstract-primary-author-name-color; + } } &.secondary { @@ -46,28 +50,30 @@ .list-teaser-abstract__headline { margin-bottom: $spacer-md; - line-height: $list-teaser-abstract-headline-line-height-small; color: $list-teaser-abstract-headline-color; - font-size: $list-teaser-abstract-headline-font-size-small; + font-size: $font-size-lg; } .list-teaser-abstract__text { @extend %heading-font-regular; margin-bottom: 0; - line-height: $list-teaser-abstract-text-line-height-small; - font-size: $list-teaser-abstract-text-font-size-small; + font-size: $font-size-base; &::first-letter { @extend %body-font-regular; float: left; - padding-top: 18px; + padding-top: 10px; padding-right: 12px; padding-left: 3px; - line-height: .35; font-size: ms(14); } + + .icon-svg { + display: block; + margin-top: $spacer-xs; + } } // @@ -76,20 +82,17 @@ @media screen and (min-width: $grid-breakpoint-md) { .list-teaser-abstract__headline { margin-bottom: $spacer-sm; - line-height: $list-teaser-abstract-headline-line-height; - font-size: $list-teaser-abstract-headline-font-size; + font-size: $font-size-xl; } .list-teaser-abstract__text { - line-height: $list-teaser-abstract-text-line-height; - font-size: $list-teaser-abstract-text-font-size; + font-size: $font-size-sm; &::first-letter { float: left; - padding-top: 18px; + padding-top: 10px; padding-right: 12px; padding-left: 3px; - line-height: .45; font-size: ms(16); } } diff --git a/components/02-molecules/visual-elements/teaser/list-teaser/abstract-list-teaser/abstract-list-teaser.html b/components/02-molecules/visual-elements/teaser/list-teaser/abstract-list-teaser/abstract-list-teaser.html index eb1715799..27ab48767 100644 --- a/components/02-molecules/visual-elements/teaser/list-teaser/abstract-list-teaser/abstract-list-teaser.html +++ b/components/02-molecules/visual-elements/teaser/list-teaser/abstract-list-teaser/abstract-list-teaser.html @@ -6,13 +6,13 @@

Artikel Headline

Lorem gibson dermatrodes boy nodality neural office sprawl futurity Lado-Acheson count zero interrupt Night City tanto papier-mache kanji corporation meta-lights neurosurgery. Lorem gibson Chiba neon neon motion Mycotoxin Metro Holografix boat RAM AI disposable lights saturation point stimulate boat systemic vehicle. - +