Merge branch 'ADD-SASS' into PR-41

archilance/settings/base.py

@@ -43,6 +43,7 @@ THIRD_PARTY_APPS = [
     'django_activeurl',
     'import_export',
     'captcha',
+    'sass_processor'
 ]
 
 LOCAL_APPS = [
@@ -270,6 +271,16 @@ STATICFILES_DIRS = (
     os.path.join(ROOT_DIR, 'assets'),
 )
 
+# SASS_PROCESSOR_INCLUDE_DIRS = [
+#     os.path.join(ROOT_DIR, 'extra-styles/scss'),
+#     os.path.join(ROOT_DIR, 'node_modules'),
+# ]
+# SASS_PROCESSOR_AUTO_INCLUDE = False
+SASS_PROCESSOR_INCLUDE_FILE_PATTERN = r'^.+\.scss$'
+SASS_PROCESSOR_ENABLED = DEBUG
+# SASS_PRECISION = 8
+SASS_PROCESSOR_ROOT = os.path.join(ROOT_DIR, 'assets')
+
 AUTH_USER_MODEL = 'users.User'
 ACCOUNT_ACTIVATION_DAYS = 7
 REGISTRATION_AUTO_LOGIN = True

requirements/new.txt

@@ -0,0 +1,84 @@
+backports-abc==0.4
+beautifulsoup4==4.5.1
+decorator==4.0.10
+defusedxml==0.4.1
+diff-match-patch==20121119
+Django==1.9.7
+django-activeurl==0.1.9
+django-appconf==1.0.2
+django-classy-tags==0.7.2
+django-compress==1.0.1
+django-compressor==2.0
+django-cors-headers==1.3.1
+django-debug-toolbar==1.4
+django-environ==0.4.0
+django-extensions==1.6.7
+django-filter==0.13.0
+django-fluent-pages==1.0.1
+django-fluent-utils==1.3
+django-guardian==1.4.4
+django-hitcount==1.2.2
+django-import-export==0.4.5
+django-mathfilters==0.4.0
+django-modelcluster==2.0
+django-mptt==0.8.4
+django-parler==1.6.5
+django-password-reset==0.9
+django-polymorphic==0.9.2
+django-polymorphic-tree==1.2.5
+django-recaptcha==1.0.5
+django-registration-redux==1.4
+django-sass-processor==0.5.2
+django-slug-preview==1.0.1
+django-tag-parser==3.0
+django-taggit==0.18.3
+django-tinymce==2.3.0
+django-treebeard==4.0.1
+django-wysiwyg==0.8.0
+djangorestframework==3.3.3
+djangorestframework-filters==0.8.0
+fake-factory==0.5.7
+future==0.15.2
+gunicorn==19.6.0
+html5lib==0.999999
+ipython==5.1.0
+ipython-genutils==0.1.0
+jsonschema==2.5.1
+libsass==0.11.2
+lxml==3.6.4
+Momoko==2.2.3
+natsort==5.0.1
+oauthlib==1.1.2
+pexpect==4.2.1
+pickleshare==0.7.4
+Pillow==3.4.2
+pkg-resources==0.0.0
+prompt-toolkit==1.0.8
+psycopg2==2.6.1
+ptyprocess==0.5.1
+pydash==3.4.3
+Pygments==2.1.3
+PyJWT==1.4.0
+python-dateutil==2.5.3
+python-social-auth==0.2.19
+python3-openid==3.0.10
+pytz==2016.6.1
+rcssmin==1.0.6
+redis==2.10.5
+requests==2.10.0
+requests-oauthlib==0.6.1
+rest-framework-generic-relations==1.1.0
+rjsmin==1.0.12
+simplegeneric==0.8.1
+six==1.10.0
+sorl-thumbnail==12.3
+sqlparse==0.1.19
+tablib==0.11.2
+tornado==4.3
+tqdm==4.8.4
+traitlets==4.3.1
+Unidecode==0.4.19
+wagtail==1.6
+wcwidth==0.1.7
+Werkzeug==0.11.10
+Willow==0.3.1