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

Fix merge conflict

pull/48/head
jonahmania 2018-01-30 14:16:37 -05:00
parent a82571a1f3 5948d33d20
commit 9db0941bb4
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 %}
<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="/static/js/jquery.cookie.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, '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 @@
* {
// color: red ;
}
@import 'settings/settings';
@import 'foundation';
@include foundation-everything;