diff --git a/bookwyrm/management/commands/compilethemes.py b/bookwyrm/management/commands/compilethemes.py deleted file mode 100644 index e3fba632..00000000 --- a/bookwyrm/management/commands/compilethemes.py +++ /dev/null @@ -1,32 +0,0 @@ -""" Compile themes """ -import os -from django.contrib.staticfiles.utils import get_files -from django.contrib.staticfiles.storage import StaticFilesStorage -from django.core.files.base import ContentFile -from django.core.management.base import BaseCommand - -import sass -from sass_processor.processor import SassProcessor - -# pylint: disable=line-too-long -class Command(BaseCommand): - """Compile themes""" - - help = "Compile theme scss files" - - # pylint: disable=no-self-use,unused-argument - def handle(self, *args, **options): - """compile themes""" - storage = StaticFilesStorage() - theme_files = list(get_files(storage, location="css/themes")) - theme_files = [t for t in theme_files if t[-5:] == ".scss"] - for filename in theme_files: - path = storage.path(filename) - content = sass.compile( - filename=path, - include_paths=SassProcessor.include_paths, - ) - basename, _ = os.path.splitext(path) - destination_filename = basename + ".css" - print(f"saving f{destination_filename}") - storage.save(destination_filename, ContentFile(content)) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 7d04a046..d698a34d 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -189,6 +189,10 @@ STATICFILES_FINDERS = [ SASS_PROCESSOR_INCLUDE_FILE_PATTERN = r"^.+\.[s]{0,1}(?:a|c)ss$" +SASS_PROCESSOR_INCLUDE_DIRS = [ + os.path.join(BASE_DIR, ".css-config-sample"), +] + # minify css is production but not dev if not DEBUG: SASS_OUTPUT_STYLE = "compressed" diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index dc18643a..a57063cb 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -1,14 +1,14 @@ {% load layout %} -{% load sass_tags %} {% load i18n %} {% load static %} +{% load sass_tags %} {% block title %}BookWyrm{% endblock %} - {{ site.name }} - + diff --git a/bw-dev b/bw-dev index fe9078d6..d95eba30 100755 --- a/bw-dev +++ b/bw-dev @@ -107,7 +107,7 @@ case "$CMD" in --config dev-tools/.stylelintrc.js ;; compilescss) - runweb python manage.py compilethemes + runweb python manage.py compilescss runweb python manage.py collectstatic --no-input ;; collectstatic_watch)