Skip to content

Revert "Decouple XModule styles from LMS/Studio styles (attempt 2)" - #32191

Merged
rgraber merged 1 commit into
masterfrom
revert-32188-and/decople_xmodule_styles
May 5, 2023
Merged

Revert "Decouple XModule styles from LMS/Studio styles (attempt 2)"#32191
rgraber merged 1 commit into
masterfrom
revert-32188-and/decople_xmodule_styles

Conversation

@kdmccormick

Copy link
Copy Markdown
Member

Reverts #32188

Just prepping this in case!

Will close this if no issues arise after #32188 settles in production.

@kdmccormick
kdmccormick force-pushed the revert-32188-and/decople_xmodule_styles branch from 79f394a to 710da90 Compare May 5, 2023 17:59
@rgraber
rgraber marked this pull request as ready for review May 5, 2023 19:04
@rgraber

rgraber commented May 5, 2023

Copy link
Copy Markdown
Contributor

Merging this revert. The previous PR broke the edX/2U build with

mkdir_p path('/edx/app/edxapp/edx-platform/themes/red-theme/lms/static/css')
rtlcss /edx/app/edxapp/edx-platform/themes/red-theme/lms/static/css/bootstrap/lms-main.css /edx/app/edxapp/edx-platform/themes/red-theme/lms/static/css/bootstrap/lms-main-rtl.css
rtlcss /edx/app/edxapp/edx-platform/themes/red-theme/lms/static/css/discussion/lms-discussion-bootstrap.css /edx/app/edxapp/edx-platform/themes/red-theme/lms/static/css/discussion/lms-discussion-bootstrap-rtl.css
mkdir_p path('/edx/app/edxapp/edx-platform/themes/dark-theme/lms/static/css')
rtlcss /edx/app/edxapp/edx-platform/themes/dark-theme/lms/static/css/bootstrap/lms-main.css /edx/app/edxapp/edx-platform/themes/dark-theme/lms/static/css/bootstrap/lms-main-rtl.css
rtlcss /edx/app/edxapp/edx-platform/themes/dark-theme/lms/static/css/discussion/lms-discussion-bootstrap.css /edx/app/edxapp/edx-platform/themes/dark-theme/lms/static/css/discussion/lms-discussion-bootstrap-rtl.css
mkdir_p path('/edx/app/edxapp/edx-platform/themes/edge.edx.org/lms/static/css')
rtlcss /edx/app/edxapp/edx-platform/themes/edge.edx.org/lms/static/css/bootstrap/lms-main.css /edx/app/edxapp/edx-platform/themes/edge.edx.org/lms/static/css/bootstrap/lms-main-rtl.css
rtlcss /edx/app/edxapp/edx-platform/themes/edge.edx.org/lms/static/css/discussion/lms-discussion-bootstrap.css /edx/app/edxapp/edx-platform/themes/edge.edx.org/lms/static/css/discussion/lms-discussion-bootstrap-rtl.css
mkdir_p path('/edx/app/edxapp/edx-platform/themes/stanford-style/lms/static/css')
rtlcss /edx/app/edxapp/edx-platform/themes/stanford-style/lms/static/css/bootstrap/lms-main.css /edx/app/edxapp/edx-platform/themes/stanford-style/lms/static/css/bootstrap/lms-main-rtl.css
rtlcss /edx/app/edxapp/edx-platform/themes/stanford-style/lms/static/css/discussion/lms-discussion-bootstrap.css /edx/app/edxapp/edx-platform/themes/stanford-style/lms/static/css/discussion/lms-discussion-bootstrap-rtl.css
mkdir_p path('/edx/var/edx-themes/edx-themes/edx-platform/labxchange/lms/static/css')
rtlcss /edx/var/edx-themes/edx-themes/edx-platform/labxchange/lms/static/css/bootstrap/lms-main.css /edx/var/edx-themes/edx-themes/edx-platform/labxchange/lms/static/css/bootstrap/lms-main-rtl.css
rtlcss /edx/var/edx-themes/edx-themes/edx-platform/labxchange/lms/static/css/discussion/lms-discussion-bootstrap.css /edx/var/edx-themes/edx-themes/edx-platform/labxchange/lms/static/css/discussion/lms-discussion-bootstrap-rtl.css
mkdir_p path('/edx/var/edx-themes/edx-themes/edx-platform/edx.org-next/lms/static/css')
rtlcss /edx/var/edx-themes/edx-themes/edx-platform/edx.org-next/lms/static/css/bootstrap/lms-main.css /edx/var/edx-themes/edx-themes/edx-platform/edx.org-next/lms/static/css/bootstrap/lms-main-rtl.css
rtlcss /edx/var/edx-themes/edx-themes/edx-platform/edx.org-next/lms/static/css/discussion/lms-discussion-bootstrap.css /edx/var/edx-themes/edx-themes/edx-platform/edx.org-next/lms/static/css/discussion/lms-discussion-bootstrap-rtl.css
Traceback (most recent call last):
  File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/paver/tasks.py", line 201, in _run_task
    return do_task()
  File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/paver/tasks.py", line 198, in do_task
    return func(**kw)
  File "/edx/app/edxapp/edx-platform/pavelib/utils/timer.py", line 40, in timed
    return wrapped(*args, **kwargs)
  File "/edx/app/edxapp/edx-platform/pavelib/assets.py", line 496, in compile_sass
    is_successful = _compile_sass(
  File "/edx/app/edxapp/edx-platform/pavelib/assets.py", line 581, in _compile_sass
    sass.compile(
  File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/sass.py", line 644, in compile
    raise CompileError(v)
sass.CompileError: b'Error: Undefined variable: "$pink".\n        on line 68 of lms/static/sass/partials/lms/theme/_variables-v1.scss\n>> $pink-l1: tint($pink, 20%) !default;\n   ---------------^\n'

@rgraber
rgraber merged commit 05487e9 into master May 5, 2023
@rgraber
rgraber deleted the revert-32188-and/decople_xmodule_styles branch May 5, 2023 19:06
@kdmccormick

Copy link
Copy Markdown
Member Author

Bummer! Thanks for the logs.

@edx-pipeline-bot

Copy link
Copy Markdown
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
Copy Markdown
Contributor

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

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