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.

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

Jump to bottom

Decouple XModule styles from LMS/Studio styles (attempt 2) #32188

Merged
merged 3 commits into from
May 5, 2023
Merged

Decouple XModule styles from LMS/Studio styles (attempt 2) #32188

merged 3 commits into from
May 5, 2023

Conversation

andrey-canon
Copy link
Contributor

Description

This pr includes the changes of this #32018 and fixes compilation issue, which was described in this revert #32183

The fix 19d4971

Testing instructions

For basic testing please go to #32018 and follow the steps described there

For theme testing (Using tutor)

  1. Copy the theme folder inside /end/build/openedx/themes
  2. Run tutor dev start [--mount=./some path if you want to set a edx-platform volume] and wait
  3. Go inside the container docker exec -it tutor_nightly_dev-lms-1 /bin/bash
  4. Run openedx-assets themes --theme-dirs /openedx/themes /openedx/themes/parent-folder-of -your-theme --themes name-of-your-theme

Results

Previous the fix

image

After the fix

image

@andrey-canon
feat: decople XModule style assets by using a custom webpack loader
2032b73 
This basically changes how the xmodule static files are generated and consumed in order to separate the Xblock styles from general style files.

Addressing the issue openedx#31624
@andrey-canon
feat: move scss imports to its specific file
f362330
@andrey-canon
fix: add system dirs to theme lookup paths.
19d4971
@openedx-webhooks openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label May 4, 2023
@openedx-webhooks
Copy link

Thanks for the pull request, @andrey-canon! Please note that it may take us up to several weeks or months to complete a review and merge your PR.

Feel free to add as much of the following information to the ticket as you can:

  • supporting documentation
  • Open edX discussion forum threads
  • timeline information ("this must be merged by XX date", and why that is)
  • partner information ("this is a course on edx.org")
  • any other information that can help Product understand the context for the PR

All technical communication about the code itself will be done via the GitHub pull request interface. As a reminder, our process documentation is here.

Please let us know once your PR is ready for our review and all tests are green.

@andrey-canon
Copy link
Contributor Author

Hi @kdmccormick, could you please review it ?, this fixes the theme dependencies issue

kdmccormick
kdmccormick approved these changes May 4, 2023
View reviewed changes
Copy link
Member

@kdmccormick kdmccormick left a comment

Choose a reason for hiding this comment

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

Thanks for the quick fix. I confirmed this with the red-theme, dark-theme, and tutor-indigo theme.

This was referenced May 4, 2023
Merged
Merged
@kdmccormick kdmccormick merged commit c34f8ef into openedx:master May 5, 2023
@openedx-webhooks
Copy link

@andrey-canon 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future.

@kdmccormick kdmccormick changed the title Decouple XModule styles from LMS/Studio styles Decouple XModule styles from LMS/Studio styles (attempt 2) May 5, 2023
@kdmccormick kdmccormick mentioned this pull request May 5, 2023
Merged
kdmccormick added a commit that referenced this pull request May 5, 2023
@kdmccormick
Revert "Decouple XModule styles from LMS/Studio styles (attempt 2) (#…
710da90 
…32188)"

This reverts commit c34f8ef.
rgraber pushed a commit that referenced this pull request May 5, 2023
@kdmccormick
Revert "Decouple XModule styles from LMS/Studio styles (attempt 2) (#…
05487e9 
…32188)" (#32191)

This reverts commit c34f8ef.
@edx-pipeline-bot
Copy link
Contributor

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

@edx-pipeline-bot
Copy link
Contributor

EdX Release Notice: This PR has been deployed to the production environment.

@kdmccormick
Copy link
Member

Reverted by #32191

kdmccormick pushed a commit that referenced this pull request May 18, 2023
@andrey-canon
Decouple XModule styles from LMS/Studio styles (attempt 3) (#32237)
516eff0 
This basically changes how the xmodule static files are
generated and consumed in order to separate the Xblock
styles from general style files. Includes:

* build: decople XModule style assets by using a custom webpack loader
* build: move scss imports to its specific file
* build: fix: add system dirs to theme lookup paths.  (fixes attempt 1)
* build: fix: use bootstrap variables instead of lms variables (fixes attempt 2)

This is an amendment to #32188,
which itself was an amendment to #32018.

Addressing the issue #31624
@kdmccormick kdmccormick mentioned this pull request May 23, 2023
Closed
@kenclary kenclary mentioned this pull request Jun 29, 2023
Merged
@kenclary kenclary mentioned this pull request Aug 4, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kdmccormick kdmccormick kdmccormick approved these changes

Assignees
No one assigned
Labels
open-source-contribution PR author is not from Axim or 2U
Projects
Contributions
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@andrey-canon @openedx-webhooks @edx-pipeline-bot @kdmccormick