Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates

Browse Source
This commit is contained in:
John Jarvis
2012-07-31 16:53:29 -04:00
parent 37ba0395e0 f3567ddd66
commit 4d1bf53027
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cms/static/sass/_content-types.scss
View File

@@ -56,10 +56,10 @@
.module a:first-child {
@extend .content-type;
background-image: url('/static/img/content-types/module.png');
background-image: url('../img/content-types/module.png');
}
.module a:first-child {
@extend .content-type;
background-image: url('/static/img/content-types/module.png');
background-image: url('../img/content-types/module.png');
}

8
lms/templates/courseware.html
View File

@@ -18,14 +18,6 @@
## <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/mode/xml/xml.js')}"></script>
## <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/mode/python/python.js')}"></script>
## image input: for clicking on images (see imageinput.html)
<script type="text/javascript" src="${static.url('js/vendor/imageinput.js')}"></script>
## TODO (cpennington): Remove this when we have a good way for modules to specify js to load on the page
## and in the wiki
<script type="text/javascript" src="${static.url('js/schematic.js')}"></script>
<%static:js group='courseware'/>
<%include file="mathjax_include.html" />