Skip to content

Commit

Permalink
revert build: common/static/css/xmodule -> xmodule/static/css (#32291)…
Browse files Browse the repository at this point in the history
…" (#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.
  • Loading branch information
kdmccormick authored and aht007 committed Jul 3, 2023
1 parent 4e61edd commit f1d5c41
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 58 deletions.
4 changes: 2 additions & 2 deletions pavelib/assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion xmodule/static/.gitignore

This file was deleted.

53 changes: 0 additions & 53 deletions xmodule/static/README.rst

This file was deleted.

4 changes: 2 additions & 2 deletions xmodule/util/xmodule_django.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
],
Expand All @@ -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:
Expand Down

0 comments on commit f1d5c41

Please sign in to comment.