From 22340cf71443003443af92102c0bc3dfdd0771be Mon Sep 17 00:00:00 2001 From: alexisben <alex@noesya.coop> Date: Wed, 14 Sep 2022 00:07:31 +0200 Subject: [PATCH] add and fix some options sass --- assets/sass/_theme/_configuration.sass | 6 ++++-- assets/sass/_theme/blocks/pages.sass | 2 +- assets/sass/_theme/blocks/partners.sass | 2 +- assets/sass/_theme/design-system/footer.sass | 6 +++--- assets/sass/_theme/design-system/typography.sass | 3 --- assets/sass/_theme/sections/organizations.sass | 7 +++++++ 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass index 32d82895..a049bc67 100644 --- a/assets/sass/_theme/_configuration.sass +++ b/assets/sass/_theme/_configuration.sass @@ -107,6 +107,8 @@ $body-overlay-color: rgba(0, 0, 0, 0.3) !default // Footer $footer-color: $main-color !default $footer-background-color: color-contrast($main-background-color, 3%) !default +$footer-logo-height: $header-logo-height !default +$footer-logo-height-md: $footer-logo-height !default // Hero $hero-height: 375px !default @@ -157,10 +159,10 @@ $definition-border-color-hovered: color-contrast($definition-border-color, 100%) // Block pages $block-pages-card-background: color-contrast($main-background-color, 10%) !default -$block-pages-card-page-background: white !default +$block-pages-card-page-background: invert($main-color) !default $block-pages-card-page-color: $main-color !default $block-pages-card-page-background-hover: color-contrast($main-background-color, 100%) !default -$block-pages-card-page-color-hover: white !default +$block-pages-card-page-color-hover: invert($main-color) !default // Block timeline $block-timeline-horizontal-background: black !default diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass index d2769543..46b20c58 100644 --- a/assets/sass/_theme/blocks/pages.sass +++ b/assets/sass/_theme/blocks/pages.sass @@ -59,7 +59,7 @@ a color: $block-pages-card-page-color .more - @include link + @include link($block-pages-card-page-color) @extend .small text-decoration-color: $block-pages-card-page-color text-decoration-line: underline diff --git a/assets/sass/_theme/blocks/partners.sass b/assets/sass/_theme/blocks/partners.sass index e0bb9add..823181d6 100644 --- a/assets/sass/_theme/blocks/partners.sass +++ b/assets/sass/_theme/blocks/partners.sass @@ -1,4 +1,4 @@ .block-partners .organizations @include in-page-with-aside - @include grid(4, xl) + @include grid(3, xl) diff --git a/assets/sass/_theme/design-system/footer.sass b/assets/sass/_theme/design-system/footer.sass index 1310cf10..c59eee1d 100644 --- a/assets/sass/_theme/design-system/footer.sass +++ b/assets/sass/_theme/design-system/footer.sass @@ -6,13 +6,13 @@ footer[role="contentinfo"] address font-size: px2rem(14) line-height: px2rem(26) - .logo img - height: 60px + height: $footer-logo-height max-width: 100% width: auto - + @include media-breakpoint-up(md) + height: $footer-logo-height-md .content @include grid(3, md) margin-bottom: $spacing1 diff --git a/assets/sass/_theme/design-system/typography.sass b/assets/sass/_theme/design-system/typography.sass index 93662da3..56e7058f 100644 --- a/assets/sass/_theme/design-system/typography.sass +++ b/assets/sass/_theme/design-system/typography.sass @@ -74,9 +74,6 @@ blockquote, .blockquote font-size: px2rem(18) font-style: normal -ul, ol - padding: 0 - address font-style: normal diff --git a/assets/sass/_theme/sections/organizations.sass b/assets/sass/_theme/sections/organizations.sass index aecc02ea..f0d6a7c2 100644 --- a/assets/sass/_theme/sections/organizations.sass +++ b/assets/sass/_theme/sections/organizations.sass @@ -1,5 +1,12 @@ .organization @include article + .media + aspect-ratio: 1/1 + img + width: 100% + height: 100% + object-fit: contain + object-position: center .organizations @include grid(2) -- GitLab