EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #731 from EbookFoundation/newfoundation 

try scss off production
pull/46/head
eshellman 2017-12-11 16:23:46 -05:00 committed by GitHub
parent 82d7bf20b6 7438b5c217
commit 76dc6d010c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -11,4 +11,7 @@ build
deploy/last-update deploy/last-update
logs/* logs/*
celerybeat.pid celerybeat.pid
.gitignore~ celerybeat-schedule
.gitignore~
static/scss/*.css
static/scss/*.css.map

2
README.md
View File

@ -22,7 +22,7 @@ to install python-setuptools in step 1:
1. Ensure MySQL and Redis are installed & running on your system. 1. Ensure MySQL and Redis are installed & running on your system.
1. Create a MySQL database and user for unglueit. 1. Create a MySQL database and user for unglueit.
1. `sudo apt-get upgrade gcc` 1. `sudo apt-get upgrade gcc`
1. `sudo apt-get install python-setuptools git python-lxml build_essential libssl-dev libffi-dev python2.7dev libxml2-dev libxslt-dev libmysqlclient-dev` 1. `sudo apt-get install python-setuptools git python-lxml build-essential libssl-dev libffi-dev python2.7-dev libxml2-dev libxslt-dev libmysqlclient-dev`
1. `sudo easy_install virtualenv virtualenvwrapper` 1. `sudo easy_install virtualenv virtualenvwrapper`
1. `git clone git@github.com:Gluejar/regluit.git` 1. `git clone git@github.com:Gluejar/regluit.git`
1. `cd regluit` 1. `cd regluit`

3
frontend/templates/base.html
View File

@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
{% load truncatechars %} {% load truncatechars %}
{% load sass_tags %}
<html> <html>
<head> <head>
@ -9,6 +10,8 @@
<link type="text/css" rel="stylesheet" href="/static/css/sitewide4.css" /> <link type="text/css" rel="stylesheet" href="/static/css/sitewide4.css" />
<link REL="SHORTCUT ICON" HREF="/static/images/favicon.ico"> <link REL="SHORTCUT ICON" HREF="/static/images/favicon.ico">
{% block extra_css %}{% endblock %} {% block extra_css %}{% endblock %}
<link href="{% sass_src 'scss/global.scss' %}" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="{{ jquery_home }}"></script> <script type="text/javascript" src="{{ jquery_home }}"></script>
<script type="text/javascript" src="/static/js/jquery.cookie.js"></script> <script type="text/javascript" src="/static/js/jquery.cookie.js"></script>
<script type="text/javascript" src="/static/js/sitewide1.js"></script> <script type="text/javascript" src="/static/js/sitewide1.js"></script>

2
frontend/templates/work.html
View File

@ -4,6 +4,7 @@
{% load humanize %} {% load humanize %}
{% load purchased %} {% load purchased %}
{% load lib_acqs %} {% load lib_acqs %}
{% load sass_tags %}
{% block title %}&#151; {% block title %}&#151;
{% if work.is_free %} {% if work.is_free %}
{{ work.title }} is a Free eBook. {% for fmt in work.formats %}[{{ fmt }}]{% endfor %} {{ work.title }} is a Free eBook. {% for fmt in work.formats %}[{{ fmt }}]{% endfor %}
@ -18,6 +19,7 @@
<link rel="stylesheet" href="/static/css/ui-lightness/jquery-ui-1.8.16.custom.css" type="text/css" media="screen"> <link rel="stylesheet" href="/static/css/ui-lightness/jquery-ui-1.8.16.custom.css" type="text/css" media="screen">
{{ kwform.media.css }} {{ kwform.media.css }}
{% endif %} {% endif %}
<link href="{% sass_src 'scss/bookview.scss' %}" rel="stylesheet" type="text/css" />
{% endblock %} {% endblock %}
{% block extra_js %} {% block extra_js %}

3
requirements_versioned.pip
View File

@ -104,3 +104,6 @@ setuptools==25.0.0
urllib3==1.16 urllib3==1.16
beautifulsoup4==4.6.0 beautifulsoup4==4.6.0
RISparser==0.4.2 RISparser==0.4.2
libsass
django-compressor
django-sass-processor

10
settings/common.py
View File

@ -74,6 +74,8 @@ STATIC_ROOT = ''
# Example: "http://media.lawrence.com/static/" # Example: "http://media.lawrence.com/static/"
STATIC_URL = '/static/' STATIC_URL = '/static/'
SASS_PROCESSOR_ROOT = os.path.join(PROJECT_DIR, 'static')
# URL prefix for admin static files -- CSS, JavaScript and images. # URL prefix for admin static files -- CSS, JavaScript and images.
# Make sure to use a trailing slash. # Make sure to use a trailing slash.
# Examples: "http://foo.com/static/admin/", "/static/admin/". # Examples: "http://foo.com/static/admin/", "/static/admin/".
@ -182,8 +184,16 @@ INSTALLED_APPS = (
'transmeta', 'transmeta',
'questionnaire', 'questionnaire',
'questionnaire.page', 'questionnaire.page',
'sass_processor',
) )
SASS_PROCESSOR_INCLUDE_DIRS = [
os.path.join(PROJECT_DIR),
os.path.join(PROJECT_DIR, 'static', 'scss'),
os.path.join('static', 'scss'),
]
# A sample logging configuration. The only tangible logging # A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to # performed by this configuration is to send an email to
# the site admins on every HTTP 500 error. # the site admins on every HTTP 500 error.

3
static/scss/bookview.scss Normal file
View File

@ -0,0 +1,3 @@
* {
color: pink !important;
}

3
static/scss/global.scss Normal file
View File

@ -0,0 +1,3 @@
* {
color: red ;
}