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

Merge pull request #47 from EbookFoundation/addfoundation 

Add all foundation styles
pull/48/merge
Jonah Mania 2018-01-30 14:01:35 -05:00 committed by GitHub
parent 7438b5c217 08e09b7653
commit 5948d33d20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/templates/base.html
View File

@ -12,6 +12,7 @@
{% block extra_css %}{% endblock %} {% block extra_css %}{% endblock %}
<link href="{% sass_src 'scss/global.scss' %}" rel="stylesheet" type="text/css" /> <link href="{% sass_src 'scss/global.scss' %}" rel="stylesheet" type="text/css" />
<link href="{% sass_src 'scss/foundation/scss/foundation.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>

3
settings/common.py
View File

@ -191,6 +191,9 @@ SASS_PROCESSOR_INCLUDE_DIRS = [
os.path.join(PROJECT_DIR), os.path.join(PROJECT_DIR),
os.path.join(PROJECT_DIR, 'static', 'scss'), os.path.join(PROJECT_DIR, 'static', 'scss'),
os.path.join('static', 'scss'), os.path.join('static', 'scss'),
os.path.join(PROJECT_DIR, 'static', 'scss', 'foundation', 'scss'),
os.path.join('static', 'scss', 'foundation', 'scss'),
# static/scss/foundation/scss/foundation.scss
] ]

1
static/scss/foundation Submodule

@ -0,0 +1 @@
Subproject commit 85c4e889ab8b1ab7ebda94fbc723330402191683

6
static/scss/global.scss
View File

@ -1,3 +1,3 @@
* { @import 'settings/settings';
color: red ; @import 'foundation';
} @include foundation-everything;