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

Fix missing escape less calc #30453

Merged

Conversation

mrtuvn
Copy link
Contributor

@mrtuvn mrtuvn commented Oct 12, 2020

Description (*)

We've escaped the content in the calc, this way the calc in the css output file will be correctly. Previously magento will return wrong calc value

Less: width: calc(100% - 20px);
Before fix
.block-reorder .product-item-name { float: left; width: calc(80%); }

Less: width: calc(~'100% - 20px');
After fix
.block-reorder .product-item-name { float: left; width: calc(100% - 20px); }

If less code contain variable escape will a little bit difference
Instead write like this: width: calc(100% - @indent__l);
We should write like this
width: ~'calc(100% - @{indent__l})';
or width: calc(~'100% -' @{indent__l});

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes magento/magento2#<issue_number>

Manual testing scenarios (*)

Scenario 1
Backend theme change

  1. Check file css output styles-m.css
  2. Find class admin__payment-method-wrapper , admin__field-control (theme backend)
  3. Make sure the final calc show correct value in output css

Scenario 2
Luma theme change

  1. Check file css output styles-m.css
  2. Find class .block-reorder .product-item-name (theme luma)
  3. Make sure the final calc show correct value in output css

Questions or comments

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds are green)

Resolved issues:

  1. resolves [Issue] Fix missing escape less calc #30542: Fix missing escape less calc

@m2-assistant
Copy link

m2-assistant bot commented Oct 12, 2020

Hi @mrtuvn. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE,
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

@mrtuvn
Copy link
Contributor Author

mrtuvn commented Oct 12, 2020

@krzksz can you review this ? Thanks

@mrtuvn mrtuvn force-pushed the fix-missing-escape-less-calc branch from c2b2e7f to 8711605 Compare October 12, 2020 14:06
@sidolov sidolov added Priority: P4 No current plan to fix. Fixing can be deferred as a logical part of more important work. Severity: S4 Affects aesthetics, professional look and feel, “quality” or “usability”. labels Oct 12, 2020
@ihor-sviziev ihor-sviziev self-assigned this Oct 12, 2020
@m2-assistant
Copy link

m2-assistant bot commented Oct 12, 2020

Hi @mrtuvn, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@ihor-sviziev ihor-sviziev reopened this Oct 12, 2020
@m2-assistant
Copy link

m2-assistant bot commented Oct 12, 2020

Hi @mrtuvn. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE,
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

@ghost ghost removed the Progress: review label Oct 12, 2020
@ghost ghost unassigned ihor-sviziev Oct 12, 2020
@ihor-sviziev
Copy link
Contributor

Oops, sorry, just pressed wrong button. Re-opened.

@ihor-sviziev
Copy link
Contributor

@magento run all tests

@ihor-sviziev ihor-sviziev added Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests Award: bug fix labels Oct 12, 2020
ihor-sviziev
ihor-sviziev previously approved these changes Oct 13, 2020
@ghost ghost removed the Progress: review label Oct 13, 2020
@ghost ghost removed the Progress: needs update label Oct 16, 2020
@magento-engcom-team
Copy link
Contributor

Hi @ihor-sviziev, thank you for the review.
ENGCOM-8334 has been created to process this Pull Request

@magento-engcom-team
Copy link
Contributor

Hi @ptylek, thank you for the review.
ENGCOM-8334 has been created to process this Pull Request

@engcom-Alfa
Copy link
Contributor

✔️ QA Passed

Case 1.

  1. Go to order creation page in admin panel;
  2. Find class admin__payment-method-wrapper , admin__field-control (theme backend)
  3. Make sure the final calc shows the correct value in output CSS

Before: ✖️ .admin__payment-method-wrapper {width: calc(47%);}

2020-10-19_11-30

After: ✔️ .admin__payment-method-wrapper {width: calc(50% - 3rem);}

2020-10-19_11-47

Case 2

  1. Go to Storefront (Recently Ordered block);
  2. Find class .block-reorder .product-item-name (theme luma)
  3. Make sure the final calc show correct value in output css

Before: ✖️ .block-reorder .product-item-name {width: calc(80%);}

2020-10-19_12-18

After: ✔️ .block-reorder .product-item-name {width: calc(100% - 20px);}

2020-10-19_12-06

@engcom-Alfa
Copy link
Contributor

@magento create issue

@engcom-Alfa engcom-Alfa added the QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope label Oct 19, 2020
@engcom-Foxtrot engcom-Foxtrot self-assigned this Oct 19, 2020
@magento-engcom-team magento-engcom-team merged commit efb599d into magento:2.4-develop Oct 24, 2020
@m2-assistant
Copy link

m2-assistant bot commented Oct 24, 2020

Hi @mrtuvn, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@mrtuvn mrtuvn deleted the fix-missing-escape-less-calc branch October 24, 2020 11:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: Design/Frontend Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests Award: bug fix Event: MageCONF CD 2020 Priority: P4 No current plan to fix. Fixing can be deferred as a logical part of more important work. Progress: accept QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope Release Line: 2.4 Severity: S4 Affects aesthetics, professional look and feel, “quality” or “usability”.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

[Issue] Fix missing escape less calc
7 participants