From b9207853c5b4149edaa134762562f46418a70725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 23 Oct 2024 13:36:18 +0200 Subject: [PATCH 1/3] Fix notification page has unbranded button by changing ds-button to base-button --- webapp/pages/notifications/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/pages/notifications/index.vue b/webapp/pages/notifications/index.vue index b3a63281a..c8843105a 100644 --- a/webapp/pages/notifications/index.vue +++ b/webapp/pages/notifications/index.vue @@ -26,14 +26,14 @@ /> - {{ $t('notifications.markAllAsRead') }} - + From 54489956ff7c4a2b5484d181330453daee70ee7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 23 Oct 2024 15:32:01 +0200 Subject: [PATCH 2/3] Change solution to make theme color brandable --- frontend/src/assets/sass/tokens.module.scss | 8 -------- webapp/constants/manifest.js | 5 +++-- webapp/constants/metadata.js | 1 + 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/frontend/src/assets/sass/tokens.module.scss b/frontend/src/assets/sass/tokens.module.scss index e32b9f074..3454ab690 100644 --- a/frontend/src/assets/sass/tokens.module.scss +++ b/frontend/src/assets/sass/tokens.module.scss @@ -28,14 +28,6 @@ $color-yellow: rgb(245, 196, 0); $color-yellow-active: rgb(255, 206, 10); $color-yellow-inverse: rgb(255, 252, 240); -/** - * @tokens Theme - * @presenter Color - */ - -// main color in general. e.g. the color in the background of the app that is visible behind the transparent iPhone status bar to name one use case, or the current color of SVGs to name another use case -$theme-color: $color-primary; - /** * @tokens Color Neutral * @presenter Color diff --git a/webapp/constants/manifest.js b/webapp/constants/manifest.js index 8662c509d..653f9f6fc 100644 --- a/webapp/constants/manifest.js +++ b/webapp/constants/manifest.js @@ -1,9 +1,10 @@ import metadata from './metadata.js' -const { APPLICATION_NAME, APPLICATION_SHORT_NAME, APPLICATION_DESCRIPTION } = metadata +const { APPLICATION_NAME, APPLICATION_SHORT_NAME, APPLICATION_DESCRIPTION, THEME_COLOR } = metadata + export default { name: APPLICATION_NAME, short_name: APPLICATION_SHORT_NAME, description: APPLICATION_DESCRIPTION, - theme_color: '$theme-color', + theme_color: THEME_COLOR, lang: 'en', } diff --git a/webapp/constants/metadata.js b/webapp/constants/metadata.js index da313c7fb..e5fedf5d9 100644 --- a/webapp/constants/metadata.js +++ b/webapp/constants/metadata.js @@ -6,4 +6,5 @@ export default { COOKIE_NAME: 'ocelot-social-token', ORGANIZATION_NAME: 'ocelot.social Community', ORGANIZATION_JURISDICTION: 'City of Angels', + THEME_COLOR: 'rgb(23, 181, 63)', // main color in general. e.g. the color in the background of the app that is visible behind the transparent iPhone status bar to name one use case, or the current color of SVGs to name another use case } From ca8db76dbfe9cc7c843d1df43629280f27558cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 24 Oct 2024 09:00:44 +0200 Subject: [PATCH 3/3] Add explicitly the set SCSS color name to comment --- webapp/constants/metadata.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/constants/metadata.js b/webapp/constants/metadata.js index e5fedf5d9..9a2cbf5c9 100644 --- a/webapp/constants/metadata.js +++ b/webapp/constants/metadata.js @@ -6,5 +6,5 @@ export default { COOKIE_NAME: 'ocelot-social-token', ORGANIZATION_NAME: 'ocelot.social Community', ORGANIZATION_JURISDICTION: 'City of Angels', - THEME_COLOR: 'rgb(23, 181, 63)', // main color in general. e.g. the color in the background of the app that is visible behind the transparent iPhone status bar to name one use case, or the current color of SVGs to name another use case + THEME_COLOR: 'rgb(23, 181, 63)', // $color-primary – as the main color in general. e.g. the color in the background of the app that is visible behind the transparent iPhone status bar to name one use case, or the current color of SVGs to name another use case }