From 57810bb564bc0a7896fc3d19bec09318323966e7 Mon Sep 17 00:00:00 2001
From: kimth <kimt@mit.edu>
Date: Wed, 25 Jul 2012 16:53:07 -0400
Subject: [PATCH] Consolidate textbox styling into codemirror.css

---
 common/lib/capa/capa/templates/textbox.html | 7 -------
 lms/static/css/codemirror.css               | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/common/lib/capa/capa/templates/textbox.html b/common/lib/capa/capa/templates/textbox.html
index dbdb597cf9..73cb1def60 100644
--- a/common/lib/capa/capa/templates/textbox.html
+++ b/common/lib/capa/capa/templates/textbox.html
@@ -27,9 +27,6 @@
 
   <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>
     // Note: We need to make the area follow the CodeMirror for this to work.
     $(function(){
@@ -41,8 +38,4 @@
       });
     });
   </script>
-  <style type="text/css">
-    .CodeMirror {border-style: solid;
-      border-width: 1px;}
-  </style>
 </section>
diff --git a/lms/static/css/codemirror.css b/lms/static/css/codemirror.css
index c28dfae339..daee5f6ab7 100644
--- a/lms/static/css/codemirror.css
+++ b/lms/static/css/codemirror.css
@@ -1,4 +1,5 @@
 .CodeMirror {
+  border: 2px solid black;
   line-height: 1em;
   font-family: monospace;
 }