Skip to content

Commit

Permalink
Merge pull request #35759 from openedx/farhan/sass-to-css-custom-tag-…
Browse files Browse the repository at this point in the history
…block-2

feat!: Replace sass with vanilla css in custom tag block
  • Loading branch information
farhan authored Nov 13, 2024
2 parents e50490d + b29a51e commit 0181068
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
3 changes: 0 additions & 3 deletions xmodule/assets/CustomTagBlockEditor.scss

This file was deleted.

5 changes: 0 additions & 5 deletions xmodule/assets/codemirror/_codemirror.scss

This file was deleted.

5 changes: 5 additions & 0 deletions xmodule/static/css-builtin-blocks/CustomTagBlockEditor.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.xmodule_edit.xmodule_CustomTagBlock .CodeMirror {
background: #fff;
font-size: 13px;
color: #3c3c3c;
}
4 changes: 2 additions & 2 deletions xmodule/template_block.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from web_fragments.fragment import Fragment
from xmodule.editing_block import EditingMixin
from xmodule.raw_block import RawMixin
from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_sass_to_fragment
from xmodule.util.builtin_assets import add_webpack_js_to_fragment, add_css_to_fragment
from xmodule.x_module import (
ResourceTemplates,
shim_xmodule_js,
Expand Down Expand Up @@ -69,7 +69,7 @@ def studio_view(self, _context):
fragment = Fragment(
self.runtime.service(self, 'mako').render_cms_template(self.mako_template, self.get_context())
)
add_sass_to_fragment(fragment, 'CustomTagBlockEditor.scss')
add_css_to_fragment(fragment, 'CustomTagBlockEditor.css')
add_webpack_js_to_fragment(fragment, 'CustomTagBlockEditor')
shim_xmodule_js(fragment, 'XMLEditingDescriptor')
return fragment
Expand Down

0 comments on commit 0181068

Please sign in to comment.