build: common/static/css/xmodule -> xmodule/static/css

Part of: #31624
openedx · May 23, 2023 · 6a1038a · 6a1038a
1 parent fa043aa
commit 6a1038a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/pavelib/assets.py b/pavelib/assets.py
@@ -201,7 +201,7 @@ def get_theme_sass_dirs(system, theme_dir):
 
         dirs.append({
             "sass_source_dir": xmodule_sass_dir,
-            "css_destination_dir": path("common") / "static" / "css" / "xmodule",
+            "css_destination_dir": path("xmodule") / "static" / "css",
             "lookup_paths": [
                 xmodule_lookup_dir,
                 *dependencies,
@@ -237,8 +237,8 @@ def get_system_sass_dirs(system):
     dirs = []
     sass_dir = path(system) / "static" / "sass"
     css_dir = path(system) / "static" / "css"
-    xmodule_sass_dir = path("xmodule") / "sass" / system
-    xmodule_lookup_dir = path("xmodule") / "sass" / "include"
+    xmodule_sass_dir = path("xmodule") / "static" / "sass" / system
+    xmodule_lookup_dir = path("xmodule") / "static" / "sass" / "include"
 
     dependencies = SASS_LOOKUP_DEPENDENCIES.get(system, [])
     dirs.append({
@@ -252,7 +252,7 @@ def get_system_sass_dirs(system):
 
     dirs.append({
         "sass_source_dir": xmodule_sass_dir,
-        "css_destination_dir": path("common") / "static" / "css" / "xmodule",
+        "css_destination_dir": path("xmodule") / "static" / "css",
         "lookup_paths": [
             xmodule_lookup_dir,
             *dependencies,

diff --git a/xmodule/static/.gitignore b/xmodule/static/.gitignore
@@ -0,0 +1 @@
+/css
diff --git a/xmodule/util/xmodule_django.py b/xmodule/util/xmodule_django.py
@@ -62,7 +62,7 @@ def load_assets(self):
                         },
                         {
                             'name': 'AnnotatableBlockPreview.css',
-                            'path': 'common/static/css/xmodule/AnnotatableBlockPreview.css',
+                            'path': 'xmodule/static/css/AnnotatableBlockPreview.css',
                             'publicPath': '/static/css/xmodule/AnnotatableBlockPreview.css'
                         }
                     ],
@@ -75,7 +75,7 @@ def load_assets(self):
         """
         assets = super().load_assets()
 
-        css_path = "common/static/css/xmodule"
+        css_path = "xmodule/static/css"
         css_files = listdir(css_path)
 
         for css_file in css_files: