From ef14155306565d89d7724dad5fd68bec865126fc Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 16 May 2013 09:50:16 -0400 Subject: [PATCH] cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill --- cms/static/client_templates/metadata_editor.html | 8 ++------ cms/static/client_templates/metadata_number_entry.html | 2 +- cms/templates/widgets/metadata-edit.html | 7 +++---- common/lib/xmodule/xmodule/css/editor/edit.scss | 4 ---- common/lib/xmodule/xmodule/css/problem/edit.scss | 7 +++++++ .../js/vendor/html5-input-polyfills/number-polyfill.js | 2 +- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/cms/static/client_templates/metadata_editor.html b/cms/static/client_templates/metadata_editor.html index db355b38a7..34723edb8e 100644 --- a/cms/static/client_templates/metadata_editor.html +++ b/cms/static/client_templates/metadata_editor.html @@ -1,10 +1,6 @@ -% if showHighLevelSource: - Edit High Level Source - <%include file="source-edit.html" /> -% endif \ No newline at end of file + \ No newline at end of file diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html index f60e47160f..df534135c7 100644 --- a/cms/static/client_templates/metadata_number_entry.html +++ b/cms/static/client_templates/metadata_number_entry.html @@ -1,6 +1,6 @@
- + diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html index 744c619864..d85ca222e9 100644 --- a/cms/templates/widgets/metadata-edit.html +++ b/cms/templates/widgets/metadata-edit.html @@ -12,13 +12,12 @@ ## source-edit.html needs access to the 'source_code' value, so delete from a copy. <% del metadata_field_copy['source_code'] %> % endif - <%include file="source-edit.html" /> % endif -
+
\ 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 e94d776035..d30f69bcd2 100644 --- a/common/lib/xmodule/xmodule/css/editor/edit.scss +++ b/common/lib/xmodule/xmodule/css/editor/edit.scss @@ -4,10 +4,6 @@ .row { position: relative; - - .CodeMirror { - padding: 15px; - } } .editor-bar { diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss index be5455e901..b7c8bdaba5 100644 --- a/common/lib/xmodule/xmodule/css/problem/edit.scss +++ b/common/lib/xmodule/xmodule/css/problem/edit.scss @@ -99,6 +99,13 @@ } } +.problem-editor { +// adding padding to simple editor only - adjacent selector is needed since there are no toggles for CodeMirror + .markdown-box+.CodeMirror { + padding: 10px; + } +} + .problem-editor-icon { display: inline-block; width: 26px; 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 a9bc1b73d3..fbc7d4704b 100644 --- a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js +++ b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js @@ -3,7 +3,7 @@ /* HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-polyfill */ - + (function() { (function($) {