diff --git a/.editorconfig b/.editorconfig index a549c2c..64aa77e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -20,6 +20,6 @@ indent_size = 2 indent_style = space indent_size = 2 -[*.{css,js}] +[*.{scss,css,js}] indent_style = space indent_size = 4 diff --git a/.gitignore b/.gitignore index 5b1c82e..d3a403b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,8 @@ media /staticfiles/* node_modules yarn-error.log +*.css.map +.sass-cache # Celery celerybeat-schedule diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67cb75c..77799d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,7 @@ test: - pytest - eslint 'network/static/js/*.js' - stylelint 'network/static/css/*.css' + - stylelint 'network/static/css/*.scss' stage: stage: deploy diff --git a/docker/dev b/docker/dev index 78f837b..38e561a 100644 --- a/docker/dev +++ b/docker/dev @@ -2,7 +2,7 @@ FROM centos:7 RUN yum makecache RUN yum -y install epel-release RUN yum -y install python python-pip python-devel git gcc libjpeg-turbo-devel \ - libxml2-devel libxslt-devel mysql-devel mysql + libxml2-devel libxslt-devel mysql-devel mysql ruby-sass RUN yum -y clean all RUN pip install --upgrade pip diff --git a/docker/test b/docker/test index 93c2957..99bd252 100644 --- a/docker/test +++ b/docker/test @@ -1,6 +1,6 @@ FROM fedora:latest RUN dnf -y install python python-pip python-devel git gcc libjpeg-turbo-devel findutils \ - libxml2-devel libxslt-devel mysql-devel mysql npm redhat-rpm-config + libxml2-devel libxslt-devel mysql-devel mysql npm redhat-rpm-config ruby-sass RUN dnf -y clean all RUN npm install -g eslint stylelint diff --git a/gulpfile.js b/gulpfile.js index 48af33f..0fc676e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -10,6 +10,7 @@ var lintPathsJS = [ ]; var lintPathsCSS = [ + 'network/static/css/*.scss', 'network/static/css/*.css' ]; diff --git a/network/settings.py b/network/settings.py index 6181329..2935c40 100644 --- a/network/settings.py +++ b/network/settings.py @@ -148,6 +148,9 @@ COMPRESS_CSS_FILTERS = [ 'compressor.filters.css_default.CssAbsoluteFilter', 'compressor.filters.cssmin.rCSSMinFilter' ] +COMPRESS_PRECOMPILERS = ( + ('text/scss', 'sass --scss {infile} {outfile}'), +) # App conf ROOT_URLCONF = 'network.urls'