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

Dropping Sass support from builtin poll block #35718

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Dropping Sass support from builtin poll block #35718

merged 2 commits into from
Oct 30, 2024

Conversation

farhan
Copy link
Contributor

@farhan farhan commented Oct 24, 2024 •
edited
Loading

Dropping Sass support from builtin poll block

Parent story: #35300

Tasks:

  • Convert Sass variable into css variables

  • Compile the css file of the block following given steps.

    • Change this line to the following to avoid adding comments in the compiled css files 
           source_comments: int = SASS_COMMENTS_NONE
    • Compile the sass to uncompressed CSS using following command 
            npm run compile-sass-dev
    • Copy the compiled XBlock linked CSS (lms/static/css/*Display.css and lms/static/css/*Editor.css) into xmodule/static/css-builtin-blocks.
    • Format the CSS files using the editor.
    • Add those CSS files to version control.

  • Replace add_sass_to_fragment to add_css_to_fragment in blocks .py file

  • Remove all .scss files linked to the block under xmodule/assets.

    • Make sure to remove the .scss file in a separate alone commit so reviewer could review scss changes and they stay in history.
    • Don't remove the scss file if its linked to some other block.

Testing Notes:

  • Run npm run build to run webpack and compile sass files.
  • Run ./manage.py lms collectstatic in lms shell to re-collect static files.
  • Run ./manage.py cms collectstatic in cms shell to re-collect static files.
  • Verify the block's compiled css and the css global variables in the LMS
  • Verify the block's compiled css and the css global variables in the Studio
  • Test the XBlock rendering and User Experience in LMS
  • Test the XBlock rendering and User Experience in Studio
Screenshots
screencapture-apps-local-openedx-io-2000-learning-course-course-v1-edx-5-5-block-v1-edx-5-5-type-sequential-block-38919c50f1584339aa5b351ab859248f-block-v1-edx-5-5-type-vertical-block-0f2b96d48aa946c799a31d96943c4d6b-2024-10-25-18_17_54
screencapture-studio-local-openedx-io-8001-container-block-v1-edx-5-5-type-vertical-block-0f2b96d48aa946c799a31d96943c4d6b-2024-10-25-18_17_57
Screenshot 2024-10-25 at 6 36 49 PM
Screenshot 2024-10-25 at 6 36 54 PM

@farhan farhan added the hacktoberfest-accepted Issue accepted for hacktoberfest participants label Oct 24, 2024
@farhan farhan force-pushed the farhan/sass-to-css-poll-block-2 branch from 54d1f5c to 8a8c1c4 Compare October 24, 2024 11:40
@farhan farhan mentioned this pull request Oct 24, 2024
Closed
@farhan farhan force-pushed the farhan/sass-to-css-wordcloud-block-2 branch from 2d5df1b to d2c39bb Compare October 24, 2024 11:47
@farhan farhan force-pushed the farhan/sass-to-css-poll-block-2 branch from 8a8c1c4 to 7721307 Compare October 24, 2024 11:48
@farhan farhan marked this pull request as ready for review October 24, 2024 14:02
@farhan farhan force-pushed the farhan/sass-to-css-wordcloud-block-2 branch from d2c39bb to 2d27668 Compare October 24, 2024 14:10
@farhan farhan force-pushed the farhan/sass-to-css-poll-block-2 branch 2 times, most recently from 1341a47 to cee0957 Compare October 25, 2024 13:35
ttqureshi
ttqureshi approved these changes Oct 28, 2024
View reviewed changes
Copy link
Contributor

@ttqureshi ttqureshi left a comment

Choose a reason for hiding this comment

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

Looks good to me 🚀

@farhan farhan force-pushed the farhan/sass-to-css-wordcloud-block-2 branch 2 times, most recently from 8f7e571 to 7fce06a Compare October 28, 2024 15:24
@farhan farhan changed the base branch from farhan/sass-to-css-wordcloud-block-2 to master October 28, 2024 15:43
@farhan farhan force-pushed the farhan/sass-to-css-poll-block-2 branch 2 times, most recently from 7ef1145 to 3a90315 Compare October 28, 2024 15:46
@farhan farhan force-pushed the farhan/sass-to-css-poll-block-2 branch from 3a90315 to 7f1611e Compare October 30, 2024 06:17
@farhan farhan merged commit 5cba2b7 into master Oct 30, 2024
49 checks passed
@farhan farhan deleted the farhan/sass-to-css-poll-block-2 branch October 30, 2024 14:19
@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.

1 similar comment
@edx-pipeline-bot
Copy link
Contributor

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

@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.

1 similar comment
@edx-pipeline-bot
Copy link
Contributor

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

@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.

1 similar comment
@edx-pipeline-bot
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttqureshi ttqureshi ttqureshi approved these changes

@salman2013 salman2013 salman2013 approved these changes

Assignees
No one assigned
Labels
hacktoberfest-accepted Issue accepted for hacktoberfest participants
Projects
Aximprovements Team
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@farhan @edx-pipeline-bot @salman2013 @ttqureshi