diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index d5b6ef1b52..22fb90c1b9 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -27,6 +27,8 @@ class CMS.Views.ModuleEdit extends Backbone.View el: metadataEditor, model: new CMS.Models.MetadataEditor(metadataEditor.data('metadata')) }); + # Checks for number input fields and adds polyfill + #triggerNumberPolyfill() changedMetadata: -> return @metadataEditor.getModifiedMetadataValues() diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index e9049e9da5..74a354d09d 100644 --- a/cms/static/sass/views/_unit.scss +++ b/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; @@ -688,8 +689,6 @@ body.course.unit { } } - //input[type=others] - .action.setting-clear { @include font-size(11); background-color: $gray-l4; diff --git a/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss b/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss index 0dc07919ae..91c79d970f 100644 --- a/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss +++ b/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 diff --git a/common/lib/xmodule/xmodule/css/editor/edit.scss b/common/lib/xmodule/xmodule/css/editor/edit.scss index ac53bb5a70..d30f69bcd2 100644 --- a/common/lib/xmodule/xmodule/css/editor/edit.scss +++ b/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; diff --git a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js index 080ae27be6..ab47dcdd94 100644 --- a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js +++ b/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 diff --git a/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css b/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css index 77afc23874..fc97eb6450 100644 --- a/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css +++ b/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}