Skip to content
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.

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

[6/6] build: common/static/css/xmodule -> xmodule/static/css #32291

Merged

Conversation

kdmccormick
Copy link
Member

@kdmccormick kdmccormick commented May 23, 2023

Supporting information

This the final PR in a series:

The previous PR is:

The next series of PRs will be here:

Description

Now that all XModule SCSS is located in xmodule/static/sass,
it would make sense to co-locate the CSS there as well.

We also add a README to explain the purpose of this folder.

In the future, we will move xmodule/js and xmodule/assets
into xmodule/static.

Part of: #31624

Testing Instructions

  • Build the Tutor openedx image with this branch
  • Browse the demo course in the Studio outline editor
  • Browse the demo course in Learning MFE

Deadline

Medium urgency.

@kdmccormick kdmccormick force-pushed the kdmccormick/xmodule-static-css branch from bacfc5a to fcdb84b Compare May 23, 2023 20:15
@kdmccormick kdmccormick force-pushed the kdmccormick/xmodule-static-css branch 3 times, most recently from c522ca3 to 47e142b Compare May 23, 2023 20:22
@kdmccormick kdmccormick force-pushed the kdmccormick/xmodule-static-css branch from 47e142b to fb63433 Compare June 6, 2023 13:48
@kdmccormick kdmccormick marked this pull request as ready for review June 6, 2023 13:48
@kdmccormick kdmccormick force-pushed the kdmccormick/xmodule-static-css branch 2 times, most recently from 16185b0 to 315d125 Compare June 14, 2023 16:46
Copy link
Contributor

@feanil feanil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One small doc thing but then I think this is good to go.

xmodule/static/README.rst Outdated Show resolved Hide resolved
@kdmccormick kdmccormick force-pushed the kdmccormick/xmodule-static-css branch 4 times, most recently from eb2f650 to 81b5bf1 Compare June 16, 2023 14:46
Now that all XModule SCSS is located in xmodule/static/sass,
it would make sense to co-locate the CSS there as well.

We also add a README to explain the purpose of this new folder.

In the future, we will move xmodule/js and xmodule/assets
into xmodule/static as well.

Part of: openedx#32292
@kdmccormick kdmccormick force-pushed the kdmccormick/xmodule-static-css branch from 81b5bf1 to 46511d2 Compare June 16, 2023 14:46
@kdmccormick kdmccormick merged commit 5671dab into openedx:master Jun 20, 2023
@kdmccormick kdmccormick deleted the kdmccormick/xmodule-static-css branch June 20, 2023 12:05
@edx-pipeline-bot
Copy link
Contributor

2U Release Notice: This PR has been deployed to the edX staging environment in preparation for a release to production.

@edx-pipeline-bot
Copy link
Contributor

2U Release Notice: This PR has been deployed to the edX production environment.

kdmccormick added a commit that referenced this pull request Jun 21, 2023
@kdmccormick
Copy link
Member Author

Potential issue identified on studio.edx.org, prepping a revert here: #32526

kdmccormick added a commit that referenced this pull request Jun 21, 2023
…" (#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.
aht007 added a commit that referenced this pull request Jun 23, 2023
aht007 pushed a commit that referenced this pull request Jul 4, 2023
…" (#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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants