From 46ea758200958c54f3e6b5f6015df13ef498e2d3 Mon Sep 17 00:00:00 2001
From: farhan <farhan.khan@arbisoft.com>
Date: Thu, 24 Oct 2024 15:51:46 +0500
Subject: [PATCH 1/2] feat!: Dropping Sass support from builtin word cloud
 block, replacing with vanilla CSS

---
 xmodule/assets/WordCloudBlockDisplay.scss     |  3 --
 xmodule/assets/word_cloud/_display.scss       | 30 -----------------
 .../WordCloudBlockDisplay.css                 | 32 +++++++++++++++++++
 xmodule/word_cloud_block.py                   |  4 +--
 4 files changed, 34 insertions(+), 35 deletions(-)
 delete mode 100644 xmodule/assets/WordCloudBlockDisplay.scss
 delete mode 100644 xmodule/assets/word_cloud/_display.scss
 create mode 100644 xmodule/static/css-builtin-blocks/WordCloudBlockDisplay.css

diff --git a/xmodule/assets/WordCloudBlockDisplay.scss b/xmodule/assets/WordCloudBlockDisplay.scss
deleted file mode 100644
index 884112a4804c..000000000000
--- a/xmodule/assets/WordCloudBlockDisplay.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.xmodule_display.xmodule_WordCloudBlock {
-  @import "word_cloud/display.scss";
-}
diff --git a/xmodule/assets/word_cloud/_display.scss b/xmodule/assets/word_cloud/_display.scss
deleted file mode 100644
index 4f7320380a12..000000000000
--- a/xmodule/assets/word_cloud/_display.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@import 'bourbon/bourbon';
-@import 'lms/theme/variables';
-@import 'bootstrap/scss/variables';
-@import 'lms/theme/variables-v1';
-
-.input-cloud {
-  margin: calc((var(--baseline)/4));
-}
-
-.result_cloud_section {
-  display: none;
-  width: 0px;
-  height: 0px;
-}
-
-.result_cloud_section.active {
-  display: block;
-  width: 100%;
-  height: auto;
-  margin-top: 1em;
-    
-  h3 {
-    font-size: 100%;
-  }
-}
-
-.your_words{
-  font-size: 0.85em;
-  display: block;
-}
diff --git a/xmodule/static/css-builtin-blocks/WordCloudBlockDisplay.css b/xmodule/static/css-builtin-blocks/WordCloudBlockDisplay.css
new file mode 100644
index 000000000000..51050dcba9a1
--- /dev/null
+++ b/xmodule/static/css-builtin-blocks/WordCloudBlockDisplay.css
@@ -0,0 +1,32 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700");
+
+.xmodule_display.xmodule_WordCloudBlock {
+    /* stylelint-disable-line */
+    /* stylelint-disable-line */
+}
+
+.xmodule_display.xmodule_WordCloudBlock .input-cloud {
+    margin: calc((var(--baseline) / 4));
+}
+
+.xmodule_display.xmodule_WordCloudBlock .result_cloud_section {
+    display: none;
+    width: 0px;
+    height: 0px;
+}
+
+.xmodule_display.xmodule_WordCloudBlock .result_cloud_section.active {
+    display: block;
+    width: 100%;
+    height: auto;
+    margin-top: 1em;
+}
+
+.xmodule_display.xmodule_WordCloudBlock .result_cloud_section.active h3 {
+    font-size: 100%;
+}
+
+.xmodule_display.xmodule_WordCloudBlock .your_words {
+    font-size: 0.85em;
+    display: block;
+}
diff --git a/xmodule/word_cloud_block.py b/xmodule/word_cloud_block.py
index 26a2c38c5cfc..f34124b7dbb5 100644
--- a/xmodule/word_cloud_block.py
+++ b/xmodule/word_cloud_block.py
@@ -15,7 +15,7 @@
 from xblock.fields import Boolean, Dict, Integer, List, Scope, String
 from xmodule.editing_block import EditingMixin
 from xmodule.raw_block import EmptyDataRawMixin
-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,
@@ -262,7 +262,7 @@ def student_view(self, context):  # lint-amnesty, pylint: disable=unused-argumen
             'num_inputs': self.num_inputs,
             'submitted': self.submitted,
         }))
-        add_sass_to_fragment(fragment, 'WordCloudBlockDisplay.scss')
+        add_css_to_fragment(fragment, 'WordCloudBlockDisplay.scss')
         add_webpack_js_to_fragment(fragment, 'WordCloudBlockDisplay')
         shim_xmodule_js(fragment, 'WordCloud')
 

From 2d27668573d41d898ae109789b74c6206d6add6f Mon Sep 17 00:00:00 2001
From: farhan <farhan.khan@arbisoft.com>
Date: Thu, 24 Oct 2024 19:10:08 +0500
Subject: [PATCH 2/2] chore: chore

---
 xmodule/word_cloud_block.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xmodule/word_cloud_block.py b/xmodule/word_cloud_block.py
index f34124b7dbb5..d678f2a9a9f5 100644
--- a/xmodule/word_cloud_block.py
+++ b/xmodule/word_cloud_block.py
@@ -262,7 +262,7 @@ def student_view(self, context):  # lint-amnesty, pylint: disable=unused-argumen
             'num_inputs': self.num_inputs,
             'submitted': self.submitted,
         }))
-        add_css_to_fragment(fragment, 'WordCloudBlockDisplay.scss')
+        add_css_to_fragment(fragment, 'WordCloudBlockDisplay.css')
         add_webpack_js_to_fragment(fragment, 'WordCloudBlockDisplay')
         shim_xmodule_js(fragment, 'WordCloud')