From 53835183e465b8f1cf689c0946a21c5598b0ce8f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 29 Nov 2021 11:03:50 +0000 Subject: [PATCH] CSS: Merge default colours with our own ones Signed-off-by: Michael Tremer --- src/scss/_variables.scss | 10 +++++----- src/scss/style.scss | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index 8c4f3724..3fc97418 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -21,17 +21,17 @@ $cyan: #2ee8c8; $lwl: #4b0082; $twitter: #00acee; +$custom-colors: ( + "lwl" : $lwl, + "twitter" : $twitter, +); + // Theme $primary: #FF2E53; $secondary: $white; $light: #faf5f6; $dark: #4f4f4f; -$theme-colors: ( - "lwl" : $lwl, - "twitter" : $twitter, -); - $body-bg: $white; $body-color: $dark; diff --git a/src/scss/style.scss b/src/scss/style.scss index 147ad077..e39b1094 100644 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -6,6 +6,8 @@ @import "../bootstrap/scss/mixins"; @import "../bootstrap/scss/utilities"; +$theme-colors: map-merge($theme-colors, $custom-colors); + @import "../bootstrap/scss/root"; @import "../bootstrap/scss/reboot"; @import "../bootstrap/scss/type"; -- 2.47.3