From e1fbe1e049ce1764701a5effe25a2c3f7398d900 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 3 Oct 2012 09:47:19 -0400 Subject: [PATCH 1/3] added code mirror styles --- common/lib/xmodule/xmodule/css/codemirror/codemirror.scss | 5 +++++ common/lib/xmodule/xmodule/editing_module.py | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 common/lib/xmodule/xmodule/css/codemirror/codemirror.scss diff --git a/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss b/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss new file mode 100644 index 0000000000..0dc07919ae --- /dev/null +++ b/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss @@ -0,0 +1,5 @@ +.CodeMirror { + background: #fff; + font-size: 13px; + color: #3c3c3c; +} \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/editing_module.py b/common/lib/xmodule/xmodule/editing_module.py index 5799689b0e..e025179b63 100644 --- a/common/lib/xmodule/xmodule/editing_module.py +++ b/common/lib/xmodule/xmodule/editing_module.py @@ -30,6 +30,8 @@ class XMLEditingDescriptor(EditingDescriptor): any validation of its definition """ + css = {'scss': [resource_string(__name__, 'css/codemirror/codemirror.scss')]} + js = {'coffee': [resource_string(__name__, 'js/src/raw/edit/xml.coffee')]} js_module_name = "XMLEditingDescriptor" @@ -40,5 +42,7 @@ class JSONEditingDescriptor(EditingDescriptor): any validation of its definition """ + css = {'scss': [resource_string(__name__, 'css/codemirror/codemirror.scss')]} + js = {'coffee': [resource_string(__name__, 'js/src/raw/edit/json.coffee')]} js_module_name = "JSONEditingDescriptor" From f2be01fd8fead002ab5c150953617a25ae34deb1 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 3 Oct 2012 09:48:50 -0400 Subject: [PATCH 2/3] removed visibility toggles; added private tag --- cms/static/sass/_cms_mixins.scss | 3 ++- cms/static/sass/_graphics.scss | 1 + cms/static/sass/_unit.scss | 31 ++++++++++++++++--------------- cms/templates/overview.html | 7 +++---- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/cms/static/sass/_cms_mixins.scss b/cms/static/sass/_cms_mixins.scss index 0360fe5d37..2f0309a451 100644 --- a/cms/static/sass/_cms_mixins.scss +++ b/cms/static/sass/_cms_mixins.scss @@ -157,7 +157,8 @@ } .draft-item, - .hidden-item { + .hidden-item, + .private-item { color: #a4aab7; } diff --git a/cms/static/sass/_graphics.scss b/cms/static/sass/_graphics.scss index 1ee1313073..4a4af6b018 100644 --- a/cms/static/sass/_graphics.scss +++ b/cms/static/sass/_graphics.scss @@ -111,6 +111,7 @@ .draft-tag, .hidden-tag, +.private-tag, .has-new-draft-tag { margin-left: 3px; font-size: 9px; diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index e563d93a4e..0cc855a56f 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -226,9 +226,20 @@ padding: 20px; border-radius: 0 0 3px 3px; background: -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, .1)) $blue; + color: #fff; - .module-editor { - background: white; + .metadata_edit { + margin-bottom: 20px; + font-size: 13px; + } + + .CodeMirror { + border: 1px solid #3c3c3c; + } + + h3 { + font-size: 18px; + font-weight: 700; } h5 { @@ -238,7 +249,8 @@ } .save-button { - margin-right: 8px; + margin-top: 10px; + margin: 15px 8px 0 0; } } } @@ -266,19 +278,8 @@ } } - .visibility-options .option { - margin-right: 10px; - padding: 3px 13px 6px; - border-radius: 3px; - background: #edf1f5; - - &.checked { - background: #d1dae3; - } - - input[type="radio"] { + input[type="radio"] { margin-right: 7px; - } } .status { diff --git a/cms/templates/overview.html b/cms/templates/overview.html index 89d8c3d387..a24dc6b8ab 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -49,12 +49,11 @@ % for unit in subsection.get_children():
  • From 59c30ecdbcb486394e7b8cf61c083c44d1c480b3 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 3 Oct 2012 09:49:13 -0400 Subject: [PATCH 3/3] slightly smaller class names --- cms/static/sass/_dashboard.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/static/sass/_dashboard.scss b/cms/static/sass/_dashboard.scss index 395c9f6a2c..2abf769923 100644 --- a/cms/static/sass/_dashboard.scss +++ b/cms/static/sass/_dashboard.scss @@ -24,7 +24,7 @@ .class-name { display: block; - font-size: 22px; + font-size: 19px; font-weight: 300; }