Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into…

Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui

cms/static/sass/views/_settings.scss

@@ -384,6 +384,11 @@ body.course.settings {
       #course-overview {
         height: ($baseline*20);
       }
+
+      //adds back in CodeMirror border removed due to Unit page styling of component editors
+      .CodeMirror {
+        border: 1px solid $gray-l2;
+      }
     }
 
     // specific fields - video

cms/static/sass/views/_unit.scss

@@ -701,6 +701,7 @@ body.course.unit {
         box-shadow: none;
         text-shadow: none;
         border: 1px solid $gray-l1;
+        background-color: $gray-l4;
 
         &:hover {
           @include box-shadow(0 1px 1px $shadow);

cms/static/sass/views/_updates.scss

@@ -212,6 +212,7 @@ body.course.updates {
 	@include edit-box;
 	position: absolute;
 	right: 0;
+	top: 0;
 	z-index: 10001;
 	width: 800px;
 	padding: 30px;