Skip to content

Commit

Permalink
Dropping Sass support from builtin annotatable block (#35716)
Browse files Browse the repository at this point in the history
* feat!: Dropping Sass support from builtin annotatable block, replacing with vanilla CSS
  • Loading branch information
farhan authored Oct 28, 2024
1 parent 2373dd0 commit 1283fdd
Show file tree
Hide file tree
Showing 6 changed files with 251 additions and 206 deletions.
6 changes: 3 additions & 3 deletions xmodule/annotatable_block.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from openedx.core.djangolib.markup import HTML, Text
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.xml_block import XmlMixin
from xmodule.x_module import (
ResourceTemplates,
Expand Down Expand Up @@ -180,7 +180,7 @@ def student_view(self, context): # lint-amnesty, pylint: disable=unused-argumen
"""
fragment = Fragment()
fragment.add_content(self.get_html())
add_sass_to_fragment(fragment, 'AnnotatableBlockDisplay.scss')
add_css_to_fragment(fragment, 'AnnotatableBlockDisplay.css')
add_webpack_js_to_fragment(fragment, 'AnnotatableBlockDisplay')
shim_xmodule_js(fragment, 'Annotatable')

Expand All @@ -193,7 +193,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, 'AnnotatableBlockEditor.scss')
add_css_to_fragment(fragment, 'AnnotatableBlockEditor.css')
add_webpack_js_to_fragment(fragment, 'AnnotatableBlockEditor')
shim_xmodule_js(fragment, self.studio_js_module_name)
return fragment
3 changes: 0 additions & 3 deletions xmodule/assets/AnnotatableBlockDisplay.scss

This file was deleted.

3 changes: 0 additions & 3 deletions xmodule/assets/AnnotatableBlockEditor.scss

This file was deleted.

197 changes: 0 additions & 197 deletions xmodule/assets/annotatable/_display.scss

This file was deleted.

Loading

0 comments on commit 1283fdd

Please sign in to comment.