From 1dd067894d1e82d92aad94c3358dfb15750f082b Mon Sep 17 00:00:00 2001 From: Jiro Ghianni Date: Mon, 15 Apr 2024 16:46:00 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=92=84=20[#2311]=20Changed=20info=20c?= =?UTF-8?q?olor=20into=20secondary=20color?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/components/KCMSurvey/KCMSurvey.scss | 15 +++++++++------ src/open_inwoner/scss/views/App.scss | 5 +++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/open_inwoner/scss/components/KCMSurvey/KCMSurvey.scss b/src/open_inwoner/scss/components/KCMSurvey/KCMSurvey.scss index a45498c205..20801f54ab 100644 --- a/src/open_inwoner/scss/components/KCMSurvey/KCMSurvey.scss +++ b/src/open_inwoner/scss/components/KCMSurvey/KCMSurvey.scss @@ -1,9 +1,10 @@ .kcm-survey { display: inline-block; - border-top: 1px solid var(--color-info-darker); + border-color: var(--color-secondary-darker); + border-top: 1px solid var(--color-secondary-darker); border-right: none; border-bottom: none; - border-left: 1px solid var(--color-info-darker); + border-left: 1px solid var(--color-secondary-darker); outline: 1px solid var(--color-white); border-radius: var(--border-radius) 0 0 0; position: fixed; @@ -11,18 +12,20 @@ right: 0; z-index: 1010; padding: var(--spacing-medium); - background-color: var(--color-info-lighter); + background-color: var(--color-secondary-lightest); font-size: var(--font-size-heading-card); font-weight: bold; writing-mode: initial; & .link { - color: var(--color-info-darker); + color: var(--color-secondary-darker); } @media (min-width: 768px) { - border-width: 0; - border-color: initial; + border-top: 1px solid var(--color-secondary-darker); + border-right: 1px solid var(--color-secondary-darker); + border-bottom: 1px solid var(--color-secondary-darker); + border-left: none; border-radius: 0 var(--border-radius) var(--border-radius) 0; bottom: initial; right: initial; diff --git a/src/open_inwoner/scss/views/App.scss b/src/open_inwoner/scss/views/App.scss index 2bad8f8d7f..61c8c957bd 100644 --- a/src/open_inwoner/scss/views/App.scss +++ b/src/open_inwoner/scss/views/App.scss @@ -80,6 +80,11 @@ calc(var(--color-secondary-s) - 30%), calc(var(--color-secondary-l) + 30%) ); + --color-secondary-lightest: hsl( + var(--color-secondary-h), + calc(var(--color-secondary-s) - 30%), + calc(var(--color-secondary-l) + 50%) + ); --color-accent-h: 50; --color-accent-s: 94%; From a2de59329befdf97941ac957e89e8eca22e51c99 Mon Sep 17 00:00:00 2001 From: Jiro Ghianni Date: Tue, 27 Aug 2024 10:32:35 +0200 Subject: [PATCH 2/2] :rewind: [#2427] Set all KCM borders to info-color --- .../scss/components/KCMSurvey/KCMSurvey.scss | 18 ++++++++---------- src/open_inwoner/scss/views/App.scss | 5 ----- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/open_inwoner/scss/components/KCMSurvey/KCMSurvey.scss b/src/open_inwoner/scss/components/KCMSurvey/KCMSurvey.scss index 20801f54ab..468bf9bf17 100644 --- a/src/open_inwoner/scss/components/KCMSurvey/KCMSurvey.scss +++ b/src/open_inwoner/scss/components/KCMSurvey/KCMSurvey.scss @@ -1,31 +1,29 @@ .kcm-survey { display: inline-block; - border-color: var(--color-secondary-darker); - border-top: 1px solid var(--color-secondary-darker); + border-top: 1px solid var(--color-info-darker); border-right: none; border-bottom: none; - border-left: 1px solid var(--color-secondary-darker); - outline: 1px solid var(--color-white); + border-left: 1px solid var(--color-info-darker); border-radius: var(--border-radius) 0 0 0; position: fixed; bottom: 0; right: 0; z-index: 1010; padding: var(--spacing-medium); - background-color: var(--color-secondary-lightest); + background-color: var(--color-info-lighter); font-size: var(--font-size-heading-card); font-weight: bold; writing-mode: initial; & .link { - color: var(--color-secondary-darker); + color: var(--color-info-darker); } @media (min-width: 768px) { - border-top: 1px solid var(--color-secondary-darker); - border-right: 1px solid var(--color-secondary-darker); - border-bottom: 1px solid var(--color-secondary-darker); - border-left: none; + border-top: 1px solid var(--color-info-darker); + border-right: 1px solid var(--color-info-darker); + border-bottom: 1px solid var(--color-info-darker); + border-left: 0; border-radius: 0 var(--border-radius) var(--border-radius) 0; bottom: initial; right: initial; diff --git a/src/open_inwoner/scss/views/App.scss b/src/open_inwoner/scss/views/App.scss index 61c8c957bd..2bad8f8d7f 100644 --- a/src/open_inwoner/scss/views/App.scss +++ b/src/open_inwoner/scss/views/App.scss @@ -80,11 +80,6 @@ calc(var(--color-secondary-s) - 30%), calc(var(--color-secondary-l) + 30%) ); - --color-secondary-lightest: hsl( - var(--color-secondary-h), - calc(var(--color-secondary-s) - 30%), - calc(var(--color-secondary-l) + 50%) - ); --color-accent-h: 50; --color-accent-s: 94%;