diff --git a/.travis.yml b/.travis.yml index cb3d3ad2cdc2b2892ef1bfd6dd11a6b6e63dc6b9..fb5eaa7828d6f5b01e426be9e43d238e21b7faa5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ install: before_script: - bin/install_client_deps.sh script: -- bash -c '! lesscpy -N static/less/base.less 2>&1 | grep Error' - flake8 . --exclude '*/migrations,docs,static' --ignore E128 - py.test memopol representatives_positions representatives_recommendations - rm -rf db.sqlite diff --git a/memopol/settings.py b/memopol/settings.py index ffdd506af1839ddc01a8eb5169ecb969ac33a6a9..602111479851769738291990cd61a681c0b6271c 100644 --- a/memopol/settings.py +++ b/memopol/settings.py @@ -224,9 +224,11 @@ if os.environ.get('OPENSHIFT_LOG_DIR', None): COMPRESS_ENABLED = True COMPRESS_OFFLINE = True + COMPRESS_PRECOMPILERS = ( # ('text/coffeescript', 'coffee --compile --stdio'), - ('text/less', 'lesscpy {infile}'), + # ('text/less', 'lesscpy {infile}'), + ('text/x-scss', 'django_libsass.SassCompiler'), # ('text/x-sass', 'sass {infile} {outfile}'), # ('text/x-scss', 'sass --scss {infile} {outfile}'), # ('text/stylus', 'stylus < {infile} > {outfile}'), @@ -234,6 +236,9 @@ COMPRESS_PRECOMPILERS = ( ) +LIBSASS_SOURCE_COMMENTS = False + + LOGGING = { 'version': 1, 'disable_existing_loggers': False, diff --git a/memopol/tests/response_fixtures/DossiersTest.test_dossier_detail/content b/memopol/tests/response_fixtures/DossiersTest.test_dossier_detail/content index 0f0f6ae3d4c184b56768fba819bd9db6ae8f791e..353eed7628bcc9bc6b2691c4724d4a4a74b977c0 100644 --- a/memopol/tests/response_fixtures/DossiersTest.test_dossier_detail/content +++ b/memopol/tests/response_fixtures/DossiersTest.test_dossier_detail/content @@ -10,7 +10,7 @@ - The Political Memory of </title> - <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.3c5ffeab3cbf.css" type="text/css" /> + <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.9880026c7b85.css" type="text/css" /> <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script> <script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script> diff --git a/memopol/tests/response_fixtures/DossiersTest.test_dossier_list/content b/memopol/tests/response_fixtures/DossiersTest.test_dossier_list/content index 5bc66b59462ef84cca236481ea6a9fbe769b2935..a24215d3dd57480132564e8bb9ce8b45cf31e694 100644 --- a/memopol/tests/response_fixtures/DossiersTest.test_dossier_list/content +++ b/memopol/tests/response_fixtures/DossiersTest.test_dossier_list/content @@ -10,7 +10,7 @@ - The Political Memory of </title> - <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.3c5ffeab3cbf.css" type="text/css" /> + <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.9880026c7b85.css" type="text/css" /> <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script> <script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_chambers/content b/memopol/tests/response_fixtures/GroupListTest.test_chambers/content index adfc27952fca7864b28668a7cb9ca4728e85d778..b0f7be980efbf027a6f691dc3fd105172cf54768 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_chambers/content +++ b/memopol/tests/response_fixtures/GroupListTest.test_chambers/content @@ -10,7 +10,7 @@ - The Political Memory of </title> - <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.3c5ffeab3cbf.css" type="text/css" /> + <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.9880026c7b85.css" type="text/css" /> <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script> <script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_committees/content b/memopol/tests/response_fixtures/GroupListTest.test_committees/content index 571bcbc0b35039f61379c1fc11816b9b7eb78250..1541979c67efd47e55076ec05b9cbfe3ed94ba5a 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_committees/content +++ b/memopol/tests/response_fixtures/GroupListTest.test_committees/content @@ -10,7 +10,7 @@ - The Political Memory of </title> - <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.3c5ffeab3cbf.css" type="text/css" /> + <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.9880026c7b85.css" type="text/css" /> <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script> <script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_country/content b/memopol/tests/response_fixtures/GroupListTest.test_country/content index b4b293956d164d77a6fd3251fa807c3d6a2c9811..fdc0d6800ab08d2ebdd6d87f115b0bb89f159e60 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_country/content +++ b/memopol/tests/response_fixtures/GroupListTest.test_country/content @@ -10,7 +10,7 @@ - The Political Memory of </title> - <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.3c5ffeab3cbf.css" type="text/css" /> + <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.9880026c7b85.css" type="text/css" /> <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script> <script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_delegations/content b/memopol/tests/response_fixtures/GroupListTest.test_delegations/content index 5db3980db7ac3c59a6358dbbba2b534fc2422132..5f1f472750431615242e0409b68690da4110c0f5 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_delegations/content +++ b/memopol/tests/response_fixtures/GroupListTest.test_delegations/content @@ -10,7 +10,7 @@ - The Political Memory of </title> - <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.3c5ffeab3cbf.css" type="text/css" /> + <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.9880026c7b85.css" type="text/css" /> <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script> <script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_parties/content b/memopol/tests/response_fixtures/GroupListTest.test_parties/content index 7893458cd7b596607655363880eb2bae40019423..b40d819a6c82c3643eef00a9dd7e75b15e75c874 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_parties/content +++ b/memopol/tests/response_fixtures/GroupListTest.test_parties/content @@ -10,7 +10,7 @@ - The Political Memory of </title> - <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.3c5ffeab3cbf.css" type="text/css" /> + <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.9880026c7b85.css" type="text/css" /> <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script> <script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist/content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist/content index f2b7e7dd01cb3363ba5941aacc5df1b54a0c61cf..8860759164ede864e5940b31edafa7017d366be4 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist/content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist/content @@ -10,7 +10,7 @@ - The Political Memory of </title> - <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.3c5ffeab3cbf.css" type="text/css" /> + <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.9880026c7b85.css" type="text/css" /> <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script> <script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly/content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly/content index 9348085d2438686e2500efacc244870578b546ce..adbf44f1185606f6be49334304a3fca0e4dc81b1 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly/content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly/content @@ -10,7 +10,7 @@ - The Political Memory of </title> - <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.3c5ffeab3cbf.css" type="text/css" /> + <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.9880026c7b85.css" type="text/css" /> <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script> <script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_displaygrid/content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_displaygrid/content index 9e22cc9f0f3acb30f86306bacc36f4ca5b3d1b98..15b6de582855b202f307fc58a9e1a0686b8cbd4b 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_displaygrid/content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_displaygrid/content @@ -10,7 +10,7 @@ - The Political Memory of </title> - <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.3c5ffeab3cbf.css" type="text/css" /> + <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.9880026c7b85.css" type="text/css" /> <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script> <script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist/content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist/content index e9f36f9331f2d4e4ac972bfef7ff4dd168ff4e44..b351783d5cb0edd849905b8b2af6551642491a30 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist/content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist/content @@ -10,7 +10,7 @@ - The Political Memory of </title> - <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.3c5ffeab3cbf.css" type="text/css" /> + <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.9880026c7b85.css" type="text/css" /> <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script> <script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist/content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist/content index 9de3976c6ab46a0da5d2e823bc8fc44b9369bb72..50c266f31734da7cdd2cc86e893e00adba20f3d3 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist/content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist/content @@ -10,7 +10,7 @@ - The Political Memory of </title> - <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.3c5ffeab3cbf.css" type="text/css" /> + <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.9880026c7b85.css" type="text/css" /> <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script> <script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script> diff --git a/setup.py b/setup.py index dc9f6eaeca16d272d77c98069f4e6b87afee3117..a8f8ff20750c26e60561c64a3564b49226b7410d 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,7 @@ setup(name='political-memory', 'django-compressor>=1.6,<1.7', 'django-datetime-widget>=0.9,<1.0', 'django-filter>=0.11,<0.12', + 'django-libsass==0.7.0', 'django-representatives-votes==0.0.16', 'django-representatives==0.0.22', 'django-taggit>=0.17,<0.18', @@ -22,7 +23,6 @@ setup(name='political-memory', 'djangorestframework>=3.2.0,<3.3.0', 'hamlpy>=0.82,<0.83', 'ijson>=2.2,<2.3', - 'lesscpy>=0.10.2,<0.11.0', 'python-dateutil>=2.4,<2.5', 'unicodecsv==0.14.1', 'pytz==2015.7', diff --git a/static/less/base.less b/static/scss/base.scss similarity index 100% rename from static/less/base.less rename to static/scss/base.scss diff --git a/static/less/chambers.less b/static/scss/chambers.scss similarity index 100% rename from static/less/chambers.less rename to static/scss/chambers.scss diff --git a/static/less/external.less b/static/scss/external.scss similarity index 100% rename from static/less/external.less rename to static/scss/external.scss diff --git a/static/less/font.less b/static/scss/font.scss similarity index 100% rename from static/less/font.less rename to static/scss/font.scss diff --git a/static/less/footer.less b/static/scss/footer.scss similarity index 100% rename from static/less/footer.less rename to static/scss/footer.scss diff --git a/static/less/groups.less b/static/scss/groups.scss similarity index 100% rename from static/less/groups.less rename to static/scss/groups.scss diff --git a/static/less/header.less b/static/scss/header.scss similarity index 100% rename from static/less/header.less rename to static/scss/header.scss diff --git a/static/less/legislature.less b/static/scss/legislature.scss similarity index 100% rename from static/less/legislature.less rename to static/scss/legislature.scss diff --git a/static/less/navigation.less b/static/scss/navigation.scss similarity index 100% rename from static/less/navigation.less rename to static/scss/navigation.scss diff --git a/static/less/positions.less b/static/scss/positions.scss similarity index 78% rename from static/less/positions.less rename to static/scss/positions.scss index 7c220d7caca6f874083df2e7dd547e4637ff1e01..50a36693f04a11a4734db415fbc13c5efafed9a4 100644 --- a/static/less/positions.less +++ b/static/scss/positions.scss @@ -1,4 +1,4 @@ -@quote-size: 1em; +$quote-size: 1em; .quote { width: 70%; @@ -15,13 +15,13 @@ p:first-child:before { content: '« '; font-style: italic; - font-size: @quote-size; + font-size: $quote-size; } p:last-child:after { content: ' »'; font-style: italic; - font-size: @quote-size; + font-size: $quote-size; text-align: right; } } \ No newline at end of file diff --git a/static/less/table.less b/static/scss/table.scss similarity index 100% rename from static/less/table.less rename to static/scss/table.scss diff --git a/templates/base.html b/templates/base.html index bb38eb9446cf60125bfd776f31c590854ebde2f6..cf1676db4c49b88ee5f4afad3c89e34860305147 100644 --- a/templates/base.html +++ b/templates/base.html @@ -14,7 +14,7 @@ <link rel="stylesheet" href="{% static 'libs/bootstrap/dist/css/bootstrap.min.css' %}" type="text/css" /> <link rel="stylesheet" href="{% static 'libs/fontawesome/css/font-awesome.min.css' %}" type="text/css" /> <link rel="stylesheet" href="{% static 'libs/flag-icon-css/css/flag-icon.min.css' %}" type="text/css" /> - <link rel="stylesheet" href="{% static 'less/base.less' %}" type="text/less" /> + <link rel="stylesheet" href="{% static 'scss/base.scss' %}" type="text/x-scss" /> {% endcompress %} {% compress js %} <script type="text/javascript" src="{% static 'libs/jquery/dist/jquery.js' %}"></script>