From 134d9e2e023a0a4827455695b3d30283c58925a1 Mon Sep 17 00:00:00 2001 From: Bart Feenstra Date: Mon, 11 Nov 2024 10:21:08 +0000 Subject: [PATCH] Fix a bug where Cotton Candy's configured colors would not be applied (#2200) --- .../webpack/{variables.scss => variables.scss.j2} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename betty/project/extension/cotton_candy/webpack/{variables.scss => variables.scss.j2} (81%) diff --git a/betty/project/extension/cotton_candy/webpack/variables.scss b/betty/project/extension/cotton_candy/webpack/variables.scss.j2 similarity index 81% rename from betty/project/extension/cotton_candy/webpack/variables.scss rename to betty/project/extension/cotton_candy/webpack/variables.scss.j2 index 2b0bb0385..d276ddc0e 100644 --- a/betty/project/extension/cotton_candy/webpack/variables.scss +++ b/betty/project/extension/cotton_candy/webpack/variables.scss.j2 @@ -1,9 +1,9 @@ -$primary-inactive-color: #ffc0cb; -$primary-active-color: #ff69b4; -$link-inactive-color: #149988; -$link-active-color: #2a615a; +$primary-inactive-color: {{ project.extensions['cotton-candy'].configuration.primary_inactive_color.hex }}; +$primary-active-color: {{ project.extensions['cotton-candy'].configuration.primary_active_color.hex }}; +$link-inactive-color: {{ project.extensions['cotton-candy'].configuration.link_inactive_color.hex }}; +$link-active-color: {{ project.extensions['cotton-candy'].configuration.link_active_color.hex }}; $logo-url: url('/logo.png'); $language-svg-url: url('data:image/svg+xml;utf8,ionicons-v5-l'); $menu-svg-url: url('data:image/svg+xml;utf8,ionicons-v5-j'); $close-svg-url: url('data:image/svg+xml;utf8,ionicons-v5-m'); -$search-svg-url: url('data:image/svg+xml;utf8,ionicons-v5-f'); \ No newline at end of file +$search-svg-url: url('data:image/svg+xml;utf8,ionicons-v5-f');