revert build: common/static/css/xmodule -> xmodule/static/css (#32291)…

…" (#32526) This reverts commit 5671dab. The original PR is causing styling issues due to broken CSS references on studio.edx.org. See #32292 for follow-up.
openedx · Jun 21, 2023 · a903230 · a903230
1 parent 0137f21
commit a903230
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 58 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("xmodule") / "static" / "css",
+            "css_destination_dir": path("common") / "static" / "css" / "xmodule",
             "lookup_paths": [
                 xmodule_lookup_dir,
                 *dependencies,
@@ -252,7 +252,7 @@ def get_system_sass_dirs(system):
 
     dirs.append({
         "sass_source_dir": xmodule_sass_dir,
-        "css_destination_dir": path("xmodule") / "static" / "css",
+        "css_destination_dir": path("common") / "static" / "css" / "xmodule",
         "lookup_paths": [
             xmodule_lookup_dir,
             *dependencies,

diff --git a/xmodule/static/.gitignore b/xmodule/static/.gitignore
diff --git a/xmodule/static/README.rst b/xmodule/static/README.rst
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': 'xmodule/static/css/AnnotatableBlockPreview.css',
+                            'path': 'common/static/css/xmodule/AnnotatableBlockPreview.css',
                             'publicPath': '/static/css/xmodule/AnnotatableBlockPreview.css'
                         }
                     ],
@@ -75,7 +75,7 @@ def load_assets(self):
         """
         assets = super().load_assets()
 
-        css_path = "xmodule/static/css"
+        css_path = "common/static/css/xmodule"
         css_files = listdir(css_path)
 
         for css_file in css_files: