From 623769e9d8e8ad015a0d5e775f399bbf2a29b3ab Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 15 Jan 2013 09:57:48 -0500 Subject: [PATCH] separated common editor UI from problem and HTML editor SCSS - wip --- .../xmodule/xmodule/css/editor/display.scss | 54 +++++++++++++++++++ common/lib/xmodule/xmodule/editing_module.py | 4 +- 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 common/lib/xmodule/xmodule/css/editor/display.scss diff --git a/common/lib/xmodule/xmodule/css/editor/display.scss b/common/lib/xmodule/xmodule/css/editor/display.scss new file mode 100644 index 0000000000..40dee66c18 --- /dev/null +++ b/common/lib/xmodule/xmodule/css/editor/display.scss @@ -0,0 +1,54 @@ +* { + border: 1px solid red !important; +} + +.editor-bar { + 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; + // TODO: I added this -- Brian to fix roperly + height: 34px; + + a { + display: block; + float: left; + padding: 3px 10px 7px; + margin-left: 7px; + border-radius: 2px; + + &:hover { + background: rgba(255, 255, 255, .5); + } + } + + .editor-tabs { + position: absolute; + top: 10px; + right: 10px; + + li { + float: left; + } + + .tab { + height: 24px; + padding: 7px 20px 3px; + border: 1px solid #a5aaaf; + border-radius: 3px 3px 0 0; + @include linear-gradient(top, rgba(0, 0, 0, 0) 87%, rgba(0, 0, 0, .06)); + background-color: #e5ecf3; + font-size: 13px; + color: #3c3c3c; + box-shadow: 1px -1px 1px rgba(0, 0, 0, .05); + + &.current { + background: #fff; + border-bottom-color: #fff; + } + } + } +} \ 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 e025179b63..f718ca08ed 100644 --- a/common/lib/xmodule/xmodule/editing_module.py +++ b/common/lib/xmodule/xmodule/editing_module.py @@ -30,7 +30,7 @@ class XMLEditingDescriptor(EditingDescriptor): any validation of its definition """ - css = {'scss': [resource_string(__name__, 'css/codemirror/codemirror.scss')]} + css = {'scss': [resource_string(__name__, 'css/editor/display.scss'), resource_string(__name__, 'css/codemirror/codemirror.scss')]} js = {'coffee': [resource_string(__name__, 'js/src/raw/edit/xml.coffee')]} js_module_name = "XMLEditingDescriptor" @@ -42,7 +42,7 @@ class JSONEditingDescriptor(EditingDescriptor): any validation of its definition """ - css = {'scss': [resource_string(__name__, 'css/codemirror/codemirror.scss')]} + css = {'scss': [resource_string(__name__, 'css/editor/display.scss'), resource_string(__name__, 'css/codemirror/codemirror.scss')]} js = {'coffee': [resource_string(__name__, 'js/src/raw/edit/json.coffee')]} js_module_name = "JSONEditingDescriptor"