Commit 79c19949 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Full replace static precompile by compressor

parent 1a70b55f
......@@ -43,7 +43,6 @@ INSTALLED_APPS = [
'django.contrib.sites',
'django.contrib.sitemaps',
# Dependencies
'static_precompiler',
'tinymce',
'django_template_check', # This is only necessary in development
'rest_framework',
......@@ -75,7 +74,6 @@ MIDDLEWARE = [
ROOT_URLCONF = 'thaliawebsite.urls'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
......@@ -96,7 +94,6 @@ TEMPLATES = [
WSGI_APPLICATION = 'thaliawebsite.wsgi.application'
# Database
# https://docs.djangoproject.com/en/dev/ref/settings/#databases
......@@ -107,7 +104,6 @@ DATABASES = {
}
}
# Password validation
# https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators
......@@ -135,7 +131,6 @@ AUTHENTICATION_BACKENDS = [
'committees.backends.CommitteeBackend',
]
# Internationalization
# https://docs.djangoproject.com/en/dev/topics/i18n/
......@@ -156,7 +151,6 @@ LANGUAGES = [
LOCALE_PATHS = ('locale',)
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/dev/howto/static-files/
......@@ -173,12 +167,18 @@ STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
# other finders
'static_precompiler.finders.StaticPrecompilerFinder',
'compressor.finders.CompressorFinder',
)
# Compressor settings
COMPRESS_ENABLED = True
COMPRESS_PRECOMPILERS = (
('text/less', 'lessc {infile} {outfile}'),
)
COMPRESS_CSS_FILTERS = ['compressor.filters.css_default.CssAbsoluteFilter',
'compressor.filters.cssmin.rCSSMinFilter']
# Precompiler settings
STATIC_PRECOMPILER_LIST_FILES = True
......@@ -25,8 +25,8 @@
<link href="{% static "plugins/magnific-popup/magnific-popup.css" %}" rel="stylesheet" type="text/css">
<link href="{% static "css/jquery.fancybox.css" %}" rel="stylesheet" type="text/css">
<link href="{% static "css/style.less"|compile %}" rel="stylesheet" type="text/css">
<link href="{% static "css/skin.less"|compile %}" rel="stylesheet" type="text/css">
<link href="{% static "css/style.less" %}" rel="stylesheet" type="text/css">
<link href="{% static "css/skin.less" %}" rel="stylesheet" type="text/less">
{% endcompress %}{% endblock %}
<!-- js head -->
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment