Skip to content

E
edx-platform
Commit aa855eec by Calen Pennington
Options

Merge pull request #307 from MITx/kimth/lms-coderesponse 

Kimth/lms coderesponse
parents 81d5c17a 6631848b
Showing with 9 additions and 5 deletions
common/lib/capa/capa/templates/textbox.html
...@@ -27,9 +27,6 @@ ...@@ -27,9 +27,6 @@
<br/> <br/>
<script type="text/javascript" src="${ settings.LIB_URL }CodeMirror/codemirror.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }CodeMirror/python.js"></script>
<link rel="stylesheet" href="${ settings.LIB_URL }CodeMirror/codemirror.css" />
<script> <script>
// Note: We need to make the area follow the CodeMirror for this to work. // Note: We need to make the area follow the CodeMirror for this to work.
$(function(){ $(function(){
...@@ -42,7 +39,10 @@ ...@@ -42,7 +39,10 @@
}); });
</script> </script>
<style type="text/css"> <style type="text/css">
.CodeMirror {border-style: solid; .CodeMirror {
border-width: 1px;} border: 2px solid black;
font-size: 14px;
line-height: 18px;
}
</style> </style>
</section> </section>
lms/static/sass/base/_base.scss
...@@ -43,6 +43,10 @@ p { ...@@ -43,6 +43,10 @@ p {
span { span {
font: normal 1em/1.6em $sans-serif; font: normal 1em/1.6em $sans-serif;
} }
/* Fix for CodeMirror: prevent top-level span from affecting deeply-embedded span in CodeMirror */
.CodeMirror span {
font: inherit;
}
p + p, ul + p, ol + p { p + p, ul + p, ol + p {
margin-top: 20px; margin-top: 20px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment