abstracted out common editor styles shared by problem and html editors

common/lib/xmodule/xmodule/capa_module.py

@@ -673,7 +673,7 @@ class CapaDescriptor(RawDescriptor):
     mako_template = "widgets/problem-edit.html"
     js = {'coffee': [resource_string(__name__, 'js/src/problem/edit.coffee')]}
     js_module_name = "MarkdownEditingDescriptor"
-    css = {'scss': [resource_string(__name__, 'css/problem/edit.scss')]}
+    css = {'scss': [resource_string(__name__, 'css/editor/display.scss'), resource_string(__name__, 'css/problem/edit.scss')]}
 
     # Capa modules have some additional metadata:
     # TODO (vshnayder): do problems have any other metadata?  Do they

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

-* {
-  border: 1px solid red !important;
-}
-
 .editor-bar {
   position: relative;
   @include linear-gradient(top, #d4dee8, #c9d5e2);

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

-// TODO: this code is a subset of what is in problem editor's CSS. Should share.
-.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;
-      }
-    }
-  }
-}
-

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

 .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;
-
-  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;
-    }
 
     .advanced-toggle {
       @include white-button;

common/lib/xmodule/xmodule/html_module.py

@@ -48,7 +48,7 @@ class HtmlDescriptor(XmlDescriptor, EditingDescriptor):
 
     js = {'coffee': [resource_string(__name__, 'js/src/html/edit.coffee')]}
     js_module_name = "HTMLEditingDescriptor"
-    css = {'scss': [resource_string(__name__, 'css/html/edit.scss')]}
+    css = {'scss': [resource_string(__name__, 'css/editor/display.scss'), resource_string(__name__, 'css/html/edit.scss')]}
 
     # VS[compat] TODO (cpennington): Delete this method once all fall 2012 course
     # are being edited in the cms