diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py index 887e63cc66aa3e666183118a373f47d53ec400e4..1cd7003344cb38dc9155e9c0f7c7e078669e7199 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-setting": "aleksis.core.util.sass_helpers.get_setting", + "get-config": "aleksis.core.util.sass_helpers.get_config", } 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 18b344169fe115d9175d8ac76df80d7dc9c178ae..36d3e3f55a0e37595f3dcc27230947875cd2648b 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-setting(COLOUR_PRIMARY)), $alpha: 1); +$primary-color: adjust-color(get-colour(get-config(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-setting(COLOUR_SECONDARY)), $alpha: 1); +$secondary-color: adjust-color(get-colour(get-config(COLOUR_SECONDARY)), $alpha: 1); $success-color: color("green", "base") !default; $error-color: color("red", "base") !default; $link-color: color("light-blue", "darken-1") !default; diff --git a/aleksis/core/util/sass_helpers.py b/aleksis/core/util/sass_helpers.py index 7c86f6337dc8d8dfaa89eb958737a3bf9a16c64f..a439a22f93446bad6762ec0a2b34a717bdd19cac 100644 --- a/aleksis/core/util/sass_helpers.py +++ b/aleksis/core/util/sass_helpers.py @@ -12,5 +12,5 @@ def get_colour(html_colour: str) -> SassColor: return SassColor(r, g, b, 255) -def get_setting(setting: str) -> str: +def get_config(setting: str) -> str: return getattr(config, setting, "") or getattr(settings, setting, "")