Merge branch 'master' of edugit.org:AlekSIS/AlekSIS

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]
 

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;

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, "")