From 45520fe1248d5ff882d6926b4b3963ed68e94f1c Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 27 Feb 2013 12:59:25 -0500
Subject: [PATCH 1/4] studio - fixing line heights not syncing with code mirror
 lines and cursor

---
 cms/static/sass/_settings.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss
index d9636ed84d..7859e39fa2 100644
--- a/cms/static/sass/_settings.scss
+++ b/cms/static/sass/_settings.scss
@@ -727,7 +727,7 @@ body.course.settings {
           }
 
           pre {
-            margin-bottom: ($baseline/4);
+            line-height: 2.8rem;
           }
         }
       }

From 524f48b68e7ae5a09cd81d4bf795d24ad7afd2fe Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 27 Feb 2013 13:03:36 -0500
Subject: [PATCH 2/4] studio - fixing padding of codeMirror fields to match
 height of others given new line height

---
 cms/static/sass/_settings.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss
index 7859e39fa2..f898b9dd56 100644
--- a/cms/static/sass/_settings.scss
+++ b/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: 1px 8px;
         border: 1px solid $mediumGrey;
         border-radius: 2px;
         background-color: $lightGrey;

From cdd6ce708ea79a06a8f325e3b4d7ebecb0cb535b Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 27 Feb 2013 13:07:58 -0500
Subject: [PATCH 3/4] studio - reducing line height for codemirror JSON lines

---
 cms/static/sass/_settings.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss
index f898b9dd56..dbf5bb2ce7 100644
--- a/cms/static/sass/_settings.scss
+++ b/cms/static/sass/_settings.scss
@@ -727,7 +727,7 @@ body.course.settings {
           }
 
           pre {
-            line-height: 2.8rem;
+            line-height: 2.0rem;
           }
         }
       }

From 73ae81895805a63c42405ad71062fe2e993942cf Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 27 Feb 2013 13:08:56 -0500
Subject: [PATCH 4/4] studio - fixing padding of codeMirror fields to match
 height of others given new line height

---
 cms/static/sass/_settings.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss
index dbf5bb2ce7..d8011dd651 100644
--- a/cms/static/sass/_settings.scss
+++ b/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: 1px 8px;
+        padding: 5px 8px;
         border: 1px solid $mediumGrey;
         border-radius: 2px;
         background-color: $lightGrey;