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

Conflicts:
	cms/static/coffee/src/views/module_edit.coffee

cms/static/sass/views/_unit.scss

@@ -234,7 +234,7 @@ body.course.unit {
               opacity:.8;
 
               &:hover {
-                opacity:1;
+                opacity:.9;
                 background-color: tint($lightBluishGrey, 20%);
               }
 
@@ -481,6 +481,7 @@ body.course.unit {
   top: 0;
   right: 0;
   background-color: $blue;
+  border-bottom: 1px solid $blue-d2;
   color: $white;
 
   //Component Name
@@ -517,12 +518,12 @@ body.course.unit {
         &.is-set {
           @include linear-gradient($blue, $blue);
           color: $blue-d1;
-          box-shadow: inset 0 2px 2px $shadow-d1;
+          box-shadow: inset 1px 1px 1px $shadow-d1;
           background-color: $blue;
           cursor: default;
 
           &:hover {
-            box-shadow: inset 0 2px 2px $shadow-d1;
+            box-shadow: inset 1px 1px 1px $shadow-d1;
             background-color: $blue;
           }
         }
@@ -575,7 +576,7 @@ body.course.unit {
       background-color: $white;
       padding: 20px;
       border-bottom: 1px solid $gray-l2;
-      opacity: .6;
+      opacity: .8;
 
       &:last-child {
         //margin-bottom: 0;
@@ -666,6 +667,11 @@ body.course.unit {
 
       input[type="number"] {
         width: 39%;
+        @include box-shadow(0 1px 2px $shadow-l1 inset);
+
+        &:active {
+          background-color: #FFFCF1;
+        }
       }
 
       select {
@@ -683,8 +689,6 @@ body.course.unit {
         }
       }
 
-      //input[type=others]
-
       .action.setting-clear {
         @include font-size(11);
         background-color: $gray-l4;

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

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

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

@@ -10,8 +10,6 @@
     position: relative;
     @include linear-gradient(top, #d4dee8, #c9d5e2);
     padding: 5px;
-    border: 1px solid #3c3c3c;
-    border-radius: 3px 3px 0 0;
     border-bottom-color: #a5aaaf;
     @include clearfix;
 

common/static/js/vendor/html5-input-polyfills/number-polyfill.js

@@ -4,7 +4,8 @@
 HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-polyfill
 */
 
-
+function triggerNumberPolyfill() {
+  
 (function() {
 
   (function($) {
@@ -297,3 +298,5 @@ HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-poly
   })(jQuery);
 
 }).call(this);
+
+}
\ No newline at end of file

common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css

@@ -40,7 +40,7 @@
   padding: 10px 10px 9px;
   vertical-align: top;
 }
-.studioSkin .mceIframeContainer {border: 1px solid #3c3c3c; border-top: none;}
+.studioSkin .mceIframeContainer {border: 1px solid white; border-top: none;}
 .studioSkin .mceStatusbar {background:#F0F0EE; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}
 .studioSkin .mceStatusbar div {float:left; margin:2px}
 .studioSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/studio-icons.png) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}