Skip to content

Revert "[6/6] build: common/static/css/xmodule -> xmodule/static/css" #32526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kdmccormick merged 1 commit into from
Jun 21, 2023
Merged

Revert "[6/6] build: common/static/css/xmodule -> xmodule/static/css" #32526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pavelib/assets.py
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions xmodule/static/README.rst
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions xmodule/util/xmodule_django.py
View file
Open in desktop
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