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

Replace usage of less by sass (scss)

parent 49e800e6
......@@ -5,12 +5,12 @@ root = true
end_of_line = lf
insert_final_newline = true
[*.{py,css,less,js,html}]
[*.{py,css,scss,js,html}]
charset = utf-8
indent_style = space
trim_trailing_whitespace = true
[*.{py,css,less,js}]
[*.{py,css,scss,js}]
indent_size = 4
[*.html]
......
......@@ -14,6 +14,7 @@ website/static/
# Ignore local settings
website/thaliawebsite/settings/localsettings.py
website/.sass-cache/
# rope
.ropeproject/
......
......@@ -9,7 +9,6 @@ Getting started
---------------
0. Get at least Python 3.4 and install the Pillow requirements as per below.
Also make sure that you have `lessc` installed (see below).
1. Clone this repository
2. Run `source ./source_me.sh` (or use your own favourite virtualenv solution)
3. Run `pip install -r requirements.txt`
......@@ -47,11 +46,6 @@ For other operating systems, see the [Pillow Documentation][pillow-install].
[pillow-install]: https://pillow.readthedocs.io/en/latest/installation.html
NodeJS dependencies
-----------------------
1. `lessc`:
* On Ubuntu or Debian, use: `apt-get install node-less node-mkdirp`
Thabloid dependencies
---------------------
......
......@@ -8,7 +8,7 @@
{% block css_head %}
{{ block.super }}
{% compress css %}
<link href="{% static "documents/css/style.less" %}" rel="stylesheet" type="text/less">
<link href="{% static "documents/css/style.scss" %}" rel="stylesheet" type="text/x-scss">
{% endcompress %}
{% endblock %}
......
......@@ -4,6 +4,6 @@
{% block css_head %}
{{ block.super }}
{% compress css %}
<link href="{% static "education/css/style.less" %}" rel="stylesheet" type="text/less">
<link href="{% static "education/css/style.scss" %}" rel="stylesheet" type="text/x-scss">
{% endcompress %}
{% endblock %}
\ No newline at end of file
{% extends 'education/base.html' %}
{% load staticfiles i18n compress %}
{% block css_head %}
{{ block.super }}
{% compress css %}
<link href="{% static "education/css/style.less" %}" rel="stylesheet" type="text/less">
{% endcompress %}
{% endblock %}
{% load i18n %}
{% block title %}{% trans "Book Sale" %} — {{ block.super }}{% endblock %}
......
......@@ -43,7 +43,7 @@ STATIC_ROOT = '/static'
COMPRESS_ENABLED = True
COMPRESS_PRECOMPILERS = (
('text/less', 'lessc {infile} {outfile}'),
('text/x-scss', 'sass --scss {infile} {outfile}'),
)
COMPRESS_CSS_FILTERS = ['compressor.filters.css_default.CssAbsoluteFilter',
......
......@@ -189,7 +189,7 @@ STATICFILES_FINDERS = (
COMPRESS_ENABLED = True
COMPRESS_PRECOMPILERS = (
('text/less', 'lessc {infile} {outfile}'),
('text/x-scss', 'sass --scss {infile} {outfile}'),
)
COMPRESS_CSS_FILTERS = ['compressor.filters.css_default.CssAbsoluteFilter',
......
@preset-name: "ThImbus Blue";
@preset-icon: concrete-icon(#01adf2, #fff, #01adf2);
@background-color: #fff;
@primary-color: #01adf2;
@inverted-color:;
@lavalamp-color: #fff;
@faded-color: #fff;
@dark-primary-color: #01adf2;
@body-color:;
@logo-image: '../images/site_logo.png';
$preset-name: "ThImbus Blue";
$preset-icon: concrete-icon(#01adf2, #fff, #01adf2);
$background-color: #fff;
$primary-color: #01adf2;
$inverted-color: #000000;
$lavalamp-color: #fff;
$faded-color: #fff;
$dark-primary-color: #01adf2;
$body-color: #313131;
$logo-image: '../images/site_logo.png';
@preset-name: "ThImbus Defaults";
@preset-icon: concrete-icon(#E62272, #FFFFFF, #D8206B);
@background-color: #FFFFFF;
@primary-color: #E62272;
@inverted-color: #000000;
@lavalamp-color: rgba(230,35,113,0.68);
@faded-color: #EEEDE7;
@dark-primary-color: #D8206B;
@body-color: #313131;
@logo-image: '../images/site_logo.png';
$preset-name: "ThImbus Defaults";
$preset-icon: concrete-icon(#E62272, #FFFFFF, #D8206B);
$background-color: #FFFFFF;
$primary-color: #E62272;
$inverted-color: #000000;
$lavalamp-color: rgba(230, 35, 113, 0.68);
$faded-color: #EEEDE7;
$dark-primary-color: #D8206B;
$body-color: #313131;
$logo-image: '../images/site_logo.png';
@preset-name: "ThImbus Green";
@preset-icon: concrete-icon(#89bf43, #fff, #89bf43);
@background-color: #fff;
@primary-color: #89bf43;
@inverted-color:;
@lavalamp-color: #fff;
@faded-color: #fff;
@dark-primary-color: #89bf43;
@body-color:;
@logo-image: '../images/site_logo.png';
$preset-name: "ThImbus Green";
$preset-icon: concrete-icon(#89bf43, #fff, #89bf43);
$background-color: #fff;
$primary-color: #89bf43;
$inverted-color: #000000;
$lavalamp-color: #fff;
$faded-color: #fff;
$dark-primary-color: #89bf43;
$body-color: #313131;
$logo-image: '../images/site_logo.png';
@preset-name: "ThImbus Orange";
@preset-icon: concrete-icon(#efb700, #e7e9e2, #efb700);
@background-color: #e7e9e2;
@primary-color: #efb700;
@inverted-color:;
@lavalamp-color: #e7e9e2;
@faded-color: #e7e9e2;
@dark-primary-color: #efb700;
@body-color:;
@logo-image: '../images/site_logo.png';
/* Orange also included a background image, which isn't currently included in the preset.
* @background-image: '../../images/pattern/pattern_orange.png'; */
$preset-name: "ThImbus Orange";
$preset-icon: concrete-icon(#efb700, #e7e9e2, #efb700);
$background-color: #e7e9e2;
$primary-color: #efb700;
$inverted-color: #000000;
$lavalamp-color: #e7e9e2;
$faded-color: #e7e9e2;
$dark-primary-color: #efb700;
$body-color: #313131;
$logo-image: '../images/site_logo.png';
/* Orange also included a background image, which isn't currently included in the preset.
* $background-image: '../../images/pattern/pattern_orange.png'; */
@preset-name: "ThImbus Red";
@preset-icon: concrete-icon(#e05c50, #eeede7, #e05c50);
@background-color: #eeede7;
@primary-color: #e05c50;
@inverted-color:;
@lavalamp-color: #eeede7;
@faded-color: #EEEDE7;
@dark-primary-color: #e05c50;
@body-color:;
@logo-image: '../images/site_logo.png';
$preset-name: "ThImbus Red";
$preset-icon: concrete-icon(#e05c50, #eeede7, #e05c50);
$background-color: #eeede7;
$primary-color: #e05c50;
$inverted-color: #000000;
$lavalamp-color: #eeede7;
$faded-color: #EEEDE7;
$dark-primary-color: #e05c50;
$body-color: #313131;
$logo-image: '../images/site_logo.png';
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