diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py index e885be31f7a588d78d5236ad41ecd5d7f05404a0..78887d34f7926de812a31f4eda8e739d85f1c4af 100644 --- a/aleksis/core/settings.py +++ b/aleksis/core/settings.py @@ -523,9 +523,8 @@ SASS_PROCESSOR_CUSTOM_FUNCTIONS = { "get-preference": "aleksis.core.util.sass_helpers.get_preference", } SASS_PROCESSOR_INCLUDE_DIRS = [ - _settings.get("materialize.sass_path", JS_ROOT + "/materialize-css/sass/"), - STATIC_ROOT + "/materialize-css/sass/", - STATIC_ROOT, + _settings.get("materialize.sass_path", os.path.join(JS_ROOT, "materialize-css", "sass")), + os.path.join(STATIC_ROOT, "public"), ] ADMINS = _settings.get("contact.admins", [AUTH_INITIAL_SUPERUSER["email"]]) diff --git a/aleksis/core/static/materialize.scss b/aleksis/core/static/public/materialize-custom.scss similarity index 100% rename from aleksis/core/static/materialize.scss rename to aleksis/core/static/public/materialize-custom.scss diff --git a/aleksis/core/static/style.scss b/aleksis/core/static/public/style.scss similarity index 99% rename from aleksis/core/static/style.scss rename to aleksis/core/static/public/style.scss index 38ea2751beef343326090c1cf9bd58735b9e0b68..c2aa516e8cfcf88190aa13f43cc8f6aad5d747de 100644 --- a/aleksis/core/static/style.scss +++ b/aleksis/core/static/public/style.scss @@ -1,4 +1,4 @@ -@import "materialize"; +@import "materialize-custom"; .primary-color { background-color: $primary-color !important; diff --git a/aleksis/core/static/theme.scss b/aleksis/core/static/public/theme.scss similarity index 100% rename from aleksis/core/static/theme.scss rename to aleksis/core/static/public/theme.scss diff --git a/aleksis/core/templates/core/base.html b/aleksis/core/templates/core/base.html index 23f4060e5d3f5735023b9f5b7a307bb665582907..80e6ee8d7cae0837b1c6b91ce4b258bd2608f22b 100644 --- a/aleksis/core/templates/core/base.html +++ b/aleksis/core/templates/core/base.html @@ -24,7 +24,7 @@ {% include_css "Roboto500" %} {% include_css "Roboto700" %} {% include_css "Roboto900" %} - <link rel="stylesheet" href="{% sass_src 'style.scss' %}"> + <link rel="stylesheet" href="{% sass_src 'public/style.scss' %}"> {# Add JS URL resolver #} <script src="{% url "js_reverse" %}" type="text/javascript"></script> diff --git a/aleksis/core/templates/core/base_print.html b/aleksis/core/templates/core/base_print.html index 7691cdf804b043b373e6a4f26802fc9cdb732205..428d28f2858406c771b635c20ff874bf5c9f9d5a 100644 --- a/aleksis/core/templates/core/base_print.html +++ b/aleksis/core/templates/core/base_print.html @@ -22,7 +22,7 @@ {% include_css "Roboto700" %} {% include_css "Roboto900" %} {% include_css "paper-css" %} - <link rel="stylesheet" href="{% sass_src 'style.scss' %}"/> + <link rel="stylesheet" href="{% sass_src 'public/style.scss' %}"/> <link rel="stylesheet" href="{% static "print.css" %}"/> {% if landscape %} <link rel="stylesheet" href="{% static 'print_landscape.css' %}"/>