Commit 2048f27d authored by Krophil's avatar Krophil Committed by Sli

New temporary design

parent b401efc6
This diff is collapsed.
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<link rel="stylesheet" href="{{ static('core/jquery.datetimepicker.min.css') }}"> <link rel="stylesheet" href="{{ static('core/jquery.datetimepicker.min.css') }}">
<link rel="stylesheet" href="{{ static('core/js/ui/jquery-ui.min.css') }}"> <link rel="stylesheet" href="{{ static('core/js/ui/jquery-ui.min.css') }}">
<link rel="stylesheet" href="{{ static('ajax_select/css/ajax_select.css') }}"> <link rel="stylesheet" href="{{ static('ajax_select/css/ajax_select.css') }}">
<link rel="stylesheet" href="{{ static('core/style.css') }}"> <link href="{% sass_src 'core/temporary_design.scss' %}" rel="stylesheet" type="text/css" />
{% endblock %} {% endblock %}
</head> </head>
......
...@@ -72,6 +72,7 @@ INSTALLED_APPS = ( ...@@ -72,6 +72,7 @@ INSTALLED_APPS = (
'rest_framework', 'rest_framework',
'ajax_select', 'ajax_select',
'haystack', 'haystack',
'sass_processor',
'core', 'core',
'club', 'club',
'subscription', 'subscription',
...@@ -133,6 +134,7 @@ TEMPLATES = [ ...@@ -133,6 +134,7 @@ TEMPLATES = [
"django_jinja.builtins.extensions.UrlsExtension", "django_jinja.builtins.extensions.UrlsExtension",
"django_jinja.builtins.extensions.StaticFilesExtension", "django_jinja.builtins.extensions.StaticFilesExtension",
"django_jinja.builtins.extensions.DjangoFiltersExtension", "django_jinja.builtins.extensions.DjangoFiltersExtension",
"sass_processor.jinja2.ext.SassSrc",
], ],
"filters": { "filters": {
"markdown": "core.templatetags.renderer.markdown", "markdown": "core.templatetags.renderer.markdown",
...@@ -182,6 +184,12 @@ HAYSTACK_CONNECTIONS = { ...@@ -182,6 +184,12 @@ HAYSTACK_CONNECTIONS = {
HAYSTACK_SIGNAL_PROCESSOR = 'core.search_indexes.UserOnlySignalProcessor' HAYSTACK_SIGNAL_PROCESSOR = 'core.search_indexes.UserOnlySignalProcessor'
SASS_PRECISION = 8
SASS_OUTPUT_STYLE = 'compact'
SASS_TEMPLATE_EXTS = ['.html','.jinja']
WSGI_APPLICATION = 'sith.wsgi.application' WSGI_APPLICATION = 'sith.wsgi.application'
...@@ -230,6 +238,13 @@ MEDIA_URL = '/data/' ...@@ -230,6 +238,13 @@ MEDIA_URL = '/data/'
STATIC_URL = '/static/' STATIC_URL = '/static/'
STATIC_ROOT = './static/' STATIC_ROOT = './static/'
# Static files finders which allow to see static folder in all apps
STATICFILES_FINDERS = [
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'sass_processor.finders.CssFinder',
]
# Auth configuration # Auth configuration
AUTH_USER_MODEL = 'core.User' AUTH_USER_MODEL = 'core.User'
AUTH_ANONYMOUS_MODEL = 'core.models.AnonymousUser' AUTH_ANONYMOUS_MODEL = 'core.models.AnonymousUser'
......
Markdown is supported
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