From b29a51ecf9cc35a24935af0ab51766cb17a9f223 Mon Sep 17 00:00:00 2001 From: farhan Date: Sat, 2 Nov 2024 12:34:17 +0500 Subject: [PATCH] feat!: Replace sass with vanilla css in custom tag block --- xmodule/assets/CustomTagBlockEditor.scss | 3 --- xmodule/assets/codemirror/_codemirror.scss | 5 ----- xmodule/static/css-builtin-blocks/CustomTagBlockEditor.css | 5 +++++ xmodule/template_block.py | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 xmodule/assets/CustomTagBlockEditor.scss delete mode 100644 xmodule/assets/codemirror/_codemirror.scss create mode 100644 xmodule/static/css-builtin-blocks/CustomTagBlockEditor.css diff --git a/xmodule/assets/CustomTagBlockEditor.scss b/xmodule/assets/CustomTagBlockEditor.scss deleted file mode 100644 index 3abd162c808d..000000000000 --- a/xmodule/assets/CustomTagBlockEditor.scss +++ /dev/null @@ -1,3 +0,0 @@ -.xmodule_edit.xmodule_CustomTagBlock { - @import "codemirror/codemirror.scss"; -} diff --git a/xmodule/assets/codemirror/_codemirror.scss b/xmodule/assets/codemirror/_codemirror.scss deleted file mode 100644 index bf60ea6a49aa..000000000000 --- a/xmodule/assets/codemirror/_codemirror.scss +++ /dev/null @@ -1,5 +0,0 @@ -.CodeMirror { - background: #fff; - font-size: 13px; - color: #3c3c3c; -} diff --git a/xmodule/static/css-builtin-blocks/CustomTagBlockEditor.css b/xmodule/static/css-builtin-blocks/CustomTagBlockEditor.css new file mode 100644 index 000000000000..320b6a379cc3 --- /dev/null +++ b/xmodule/static/css-builtin-blocks/CustomTagBlockEditor.css @@ -0,0 +1,5 @@ +.xmodule_edit.xmodule_CustomTagBlock .CodeMirror { + background: #fff; + font-size: 13px; + color: #3c3c3c; +} diff --git a/xmodule/template_block.py b/xmodule/template_block.py index e6e69742cfbf..cdf83a556665 100644 --- a/xmodule/template_block.py +++ b/xmodule/template_block.py @@ -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, @@ -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