From fa81b3799dc0bb2898e88b74adef70c5133a94c5 Mon Sep 17 00:00:00 2001
From: Dominik George <nik@naturalnet.de>
Date: Sat, 4 Jan 2020 13:02:02 +0100
Subject: [PATCH] FInalise renaming of sass function for settings
---
aleksis/core/settings.py | 2 +-
aleksis/core/static/theme.scss | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index e1b986379..3af57c9e8 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -250,7 +250,7 @@ ANY_JS = {
SASS_PROCESSOR_AUTO_INCLUDE = False
SASS_PROCESSOR_CUSTOM_FUNCTIONS = {
"get-colour": "aleksis.core.util.sass_helpers.get_colour",
- "get-theme-setting": "aleksis.core.util.sass_helpers.get_theme_setting",
+ "get-setting": "aleksis.core.util.sass_helpers.get_setting",
}
SASS_PROCESSOR_INCLUDE_DIRS = [_settings.get("materialize.sass_path", JS_ROOT + "/materialize-css/sass/"), STATIC_ROOT]
diff --git a/aleksis/core/static/theme.scss b/aleksis/core/static/theme.scss
index 6cb2c9608..18b344169 100644
--- a/aleksis/core/static/theme.scss
+++ b/aleksis/core/static/theme.scss
@@ -34,11 +34,11 @@
// 1. Colors
// ==========================================================================
-$primary-color: adjust-color(get-colour(get-theme-setting(colour_primary)), $alpha: 1);
+$primary-color: adjust-color(get-colour(get-setting(COLOUR_PRIMARY)), $alpha: 1);
$primary-color-light: lighten($primary-color, 15%) !default;
$primary-color-dark: darken($primary-color, 15%) !default;
-$secondary-color: adjust-color(get-colour(get-theme-setting(colour_secondary)), $alpha: 1);
+$secondary-color: adjust-color(get-colour(get-setting(COLOUR_SECONDARY)), $alpha: 1);
$success-color: color("green", "base") !default;
$error-color: color("red", "base") !default;
$link-color: color("light-blue", "darken-1") !default;
--
GitLab