Merge pull request #1560 from MITx/bug/btalbot/studio-codemirrorlineheight

studio - CodeMirror lines + cursor bug

cms/static/sass/_settings.scss

@@ -699,7 +699,7 @@ body.course.settings {
         @include box-sizing(border-box);
         @include box-shadow(0 1px 2px rgba(0, 0, 0, .1) inset);
         @include linear-gradient($lightGrey, tint($lightGrey, 90%));
-        padding: 6px 8px;
+        padding: 5px 8px;
         border: 1px solid $mediumGrey;
         border-radius: 2px;
         background-color: $lightGrey;
@@ -727,7 +727,7 @@ body.course.settings {
           }
 
           pre {
-            margin-bottom: ($baseline/4);
+            line-height: 2.0rem;
           }
         }
       }