SCSS updates

8 years ago · 77d19e5bc4
--- a/README.md
+++ b/README.md
@ -52,6 +52,14 @@ To run this project in your development machine, follow these steps:

 9. Open your browser and go to http://127.0.0.1:8000, you will be greeted with the eDivorce homepage.  In dev mode, you can log in with any username and the password 'divorce'.

 ### SCSS Compilation

 SASS compilation is now handled by the internal `django-sass-processor` package.
 In local development, it compiles `*.scss` files it finds into the same directory
 when they're loaded in the browser (thereafter it recompiles on load when it
 detects changes by timestamp difference).  The file is collected into the
 `staticfiles` directory during build, so doesn't add overhead in production.


 ## OpenShift deployment

--- a/edivorce/apps/core/static/css/main.css
+++ b/edivorce/apps/core/static/css/main.css
--- a/edivorce/apps/core/static/css/main.css.map
+++ b/edivorce/apps/core/static/css/main.css.map
--- a/edivorce/apps/core/templates/base.html
+++ b/edivorce/apps/core/templates/base.html
@ -1,5 +1,7 @@
 {% load static %}
 {% load sass_tags %}
 {% load compress %}

 <!doctype html>
 <html class="no-js" lang="en">
    <head>
@ -13,7 +15,6 @@
        <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}">
        <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap-datepicker3.min.css" %}">
        <link rel="stylesheet" type="text/css" href="{% static "css/font-awesome.min.css" %}">
        {% load compress %}
        {% compress css %}
        <link rel="stylesheet" type="text/css" href="{% sass_src "css/main.scss" %}" />
        {% endcompress %}
--- a/edivorce/settings/local.py
+++ b/edivorce/settings/local.py
@ -22,3 +22,4 @@ REGISTER_URL = '#'
 PROXY_BASE_URL = ''
 SASS_PROCESSOR_ENABLED = True
 SASS_PROCESSOR_ROOT = PROJECT_ROOT + '/edivorce/apps/core/static'
 SASS_OUTPUT_STYLE = 'compressed'
--- a/requirements.txt
+++ b/requirements.txt
@ -2,8 +2,10 @@ Django<1.9
 django-compressor==2.1
 django-crispy-forms==1.6.1
 django-debug-toolbar==1.5
 django-sass-processor=0.5.5
 djangorestframework==3.5.3
 gunicorn==19.4.5
 libsass=0.13.3
 psycopg2==2.6.1
 requests==2.13.0
 six==1.10.0