diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py index e1b98637940f4e89c87448b5a039b7ff13c0f72c..3af57c9e8a635f0d8d010b96b15f11c48f89743c 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 6cb2c96081bad9721be4e4a6bee006c698cf4ea2..18b344169fe115d9175d8ac76df80d7dc9c178ae 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;