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/_static-pages.scss

@@ -31,41 +31,26 @@ body.course.static-pages {
       @include edit-box;
       @include box-shadow(none);
       display: none;
-      padding: 20px;
+      padding: 0;
       border-radius: 2px 2px 0 0;
 
-      .metadata_edit {
-        margin-bottom: 20px;
-        font-size: 13px;
-
-        li {
-          margin-bottom: 10px;
-        }
-
-        label {
-          display: inline-block;
-          margin-right: 10px;  
-        }
-      }
-
-      h3 {
-        margin-bottom: 10px;
-        font-size: 18px;
-        font-weight: 700;
+      //Overrides general edit-box mixin 
+      .row {
+        margin-bottom: 0px;
       }
 
-      h5 {
-        margin-bottom: 8px;
-        color: #fff;
-        font-weight: 700;
-      }
+      // This duplicates the styling from Unit page editing
+      .module-actions {
+        @include box-shadow(inset 0 1px 1px $shadow);
+        padding: 0px 0 10px 10px;
+        background-color: $gray-l6;
 
         .save-button {
-        margin-top: 10px;
         margin: 15px 8px 0 0;
         }
       }
     }
+  }
 
   .component-editor {
     border: none;

cms/static/sass/views/_unit.scss

@@ -457,7 +457,7 @@ body.course.unit {
         margin-bottom: 0px;
       }
 
-      // Module Actions
+      // Module Actions, also used for Static Pages 
       .module-actions {
         @include box-shadow(inset 0 1px 1px $shadow);
         padding: 0px 0 10px 10px;
@@ -477,7 +477,7 @@ body.course.unit {
 
 .component-edit-header {
   @include box-sizing(border-box);
-  padding: 15px 0 15px 20px;
+  padding: 18px 0 18px 20px;
   top: 0;
   right: 0;
   background-color: $blue;
@@ -502,10 +502,11 @@ body.course.unit {
     right: 0;
     top: 0;
     position: absolute;
-    padding: 10px;
+    padding: 15px;
 
     .mode {
       display: inline-block;
+      margin-left: 8px;
 
       &.inactive-mode{
         display: none;
@@ -518,13 +519,13 @@ body.course.unit {
         &.is-set {
           @include linear-gradient($blue, $blue);
           color: $blue-d1;
-          box-shadow: inset 1px 1px 1px $shadow-d1;
-          background-color: $blue;
+          box-shadow: inset 0 1px 2px 2px $shadow;
+          background-color: $blue-d4;
           cursor: default;
 
           &:hover {
-            box-shadow: inset 1px 1px 1px $shadow-d1;
-            background-color: $blue;
+            box-shadow: inset 0 1px 2px 2px  $shadow;
+            background-color: $blue-d4;
           }
         }
       }
@@ -676,7 +677,6 @@ body.course.unit {
 
       select {
         @include box-shadow(0 1px 2px $shadow-l1 inset);
-        background: none repeat scroll #F2F2F2;
 
         &:focus {
           @include box-shadow(0 0 1px $shadow);
@@ -691,7 +691,6 @@ body.course.unit {
 
       .action.setting-clear {
         @include font-size(11);
-        background-color: $gray-l4;
         color: $gray;
         width: 25px;
         height: 25px;
@@ -701,7 +700,7 @@ body.course.unit {
         margin: 0 10px;
         box-shadow: none;
         text-shadow: none;
-        border: 1px solid $gray-l4;
+        border: 1px solid $gray-l1;
 
         &:hover {
           @include box-shadow(0 1px 1px $shadow);

common/lib/xmodule/xmodule/css/codemirror/codemirror.scss

@@ -2,5 +2,4 @@
   background: #fff;
   font-size: 13px;
   color: #3c3c3c;
-  padding: 15px;
 }
\ No newline at end of file

common/lib/xmodule/xmodule/css/editor/edit.scss

@@ -4,6 +4,11 @@
 
   .row {
     position: relative;
+
+    //testing
+    .CodeMirror {
+      padding: 15px;
+    }
   }
 
   .editor-bar {