Merge pull request #35719 from openedx/farhan/sass-to-css-html-block-2

feat!: Dropping Sass support from builtin html block
openedx · Oct 30, 2024 · 2984568 · 2984568
2 parents 10a876f + 6ad6ec3
commit 2984568
Show file tree

Hide file tree

Showing 8 changed files with 724 additions and 354 deletions.
diff --git a/xmodule/assets/HtmlBlockDisplay.scss b/xmodule/assets/HtmlBlockDisplay.scss
diff --git a/xmodule/assets/HtmlBlockEditor.scss b/xmodule/assets/HtmlBlockEditor.scss
diff --git a/xmodule/assets/editor/_edit.scss b/xmodule/assets/editor/_edit.scss
@@ -18,15 +18,15 @@
     @include linear-gradient(top, #d4dee8, #c9d5e2);
 
     position: relative;
-    padding: ($baseline/4);
+    padding: calc(var(--baseline)/4);
     border-bottom-color: #a5aaaf;
 
     button {
       display: inline-block;
 
       @include float(left);
 
-      padding: 3px ($baseline/2) 5px;
+      padding: 3px calc(var(--baseline)/2) 5px;
       margin-left: 7px;
       border: 0;
       border-radius: 2px;
@@ -53,7 +53,7 @@
 
     li {
       @include float(left);
-      @include margin-right($baseline/4);
+      @include margin-right(calc(var(--baseline)/4));
 
       &:last-child {
         @include margin-right(0);
@@ -67,16 +67,16 @@
       border: 1px solid #a5aaaf;
       border-radius: 3px 3px 0 0;
 
-      @include linear-gradient(top, $transparent 87%, rgba(0, 0, 0, .06));
+      @include linear-gradient(top, var(--transparent) 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: $white;
-        border-bottom-color: $white;
+        background: var(--white);
+        border-bottom-color: var(--white);
       }
     }
   }

diff --git a/xmodule/assets/html/_display.scss b/xmodule/assets/html/_display.scss
diff --git a/xmodule/assets/html/_edit.scss b/xmodule/assets/html/_edit.scss