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

Visual tweaks for shipping task partners #37229

Merged
merged 6 commits into from Mar 20, 2023

Conversation

moon0326
Copy link
Contributor

All Submissions:

Changes proposed in this Pull Request:

This PR tweaks shipping task partner CSS. For more details, please see #36977

Closes #36977 .

How to test the changes in this Pull Request:

  1. Checkout the branch and build the assets.
  2. Add return true from here to force Shipping Task.
  3. Start OBW and choose Denmark as your store country to force the dual shipping partner layout.
  4. Go to WooCommerce -> Home and click Add shipping costs task.
  5. Confirm the changes.
  6. Change the story country to Australia to force the single shipping partner layout.
  7. Go to WooCommerce -> Home and click Add shipping costs task.
  8. Confirm the single shipping partner layout.

Before
Screen Shot 2023-03-14 at 6 16 55 PM

After (More spacing between the image and list)
Screen Shot 2023-03-14 at 6 17 06 PM

Other information:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes, as applicable?
  • Have you created a changelog file for each project being changed, ie pnpm --filter=<project> changelog add?
  • Have you included testing instructions?

FOR PR REVIEWER ONLY:

  • I have reviewed that everything is sanitized/escaped appropriately for any SQL or XSS injection possibilities. I made sure Linting is not ignored or disabled.

@moon0326 moon0326 requested review from a team, chihsuan and adrianduffell March 15, 2023 01:23
@github-actions github-actions bot added focus: react admin [team:Ghidorah] plugin: woocommerce Issues related to the WooCommerce Core plugin. labels Mar 15, 2023
@codecov
Copy link

codecov bot commented Mar 15, 2023

Codecov Report

Merging #37229 (981f867) into trunk (0cf5677) will decrease coverage by 0.0%.
The diff coverage is 32.0%.

❗ Current head 981f867 differs from pull request most recent head f484ceb. Consider uploading reports for the commit f484ceb to get more accurate results

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             trunk   #37229     +/-   ##
==========================================
- Coverage     46.7%    46.7%   -0.0%     
- Complexity   17191    17192      +1     
==========================================
  Files          429      429             
  Lines        64845    64872     +27     
==========================================
+ Hits         30275    30282      +7     
- Misses       34570    34590     +20     
Impacted Files Coverage Δ
...ugins/woocommerce/includes/class-wc-post-types.php 2.7% <0.0%> (-0.1%) ⬇️
...gins/woocommerce/includes/wc-product-functions.php 44.7% <100.0%> (+1.0%) ⬆️

... and 2 files with indirect coverage changes

@github-actions
Copy link
Contributor

github-actions bot commented Mar 15, 2023

Test Results Summary

Commit SHA: f484ceb

Test 🧪Passed ✅Failed 🚨Broken 🚧Skipped ⏭️Unknown ❔Total 📊Duration ⏱️
API Tests25900202610m 48s
E2E Tests189006019514m 23s

To view the full API test report, click here.
To view the full E2E test report, click here.
To view all test reports, visit the WooCommerce Test Reports Dashboard.

Copy link
Member

@chihsuan chihsuan left a comment

Choose a reason for hiding this comment

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

Hey @moon0326 Thanks fort tweaking this. I wasn't able to see the dual layout when choosing Denmark as my store country so I used UK instead.

And I'm not sure if it's my local env issue. I don't see any difference in the single shipping partner layout. 🤔

trunk
Screenshot 2023-03-15 at 13 55 53

this branch
Screenshot 2023-03-15 at 13 56 01

BTW, It seem that the linting is failing.

@chihsuan
Copy link
Member

@verofasulo Do you think it would be better to align the buttons to the bottom?

Screenshot 2023-03-15 at 14 01 23

@verofasulo
Copy link

Do you think it would be better to align the buttons to the bottom?

@chihsuan, thanks for tagging me 💜 And yes, totally! 🙏

@moon0326
Copy link
Contributor Author

Hey @moon0326 Thanks fort tweaking this. I wasn't able to see the dual layout when choosing Denmark as my store country so I used UK instead.

And I'm not sure if it's my local env issue. I don't see any difference in the single shipping partner layout. 🤔

trunk Screenshot 2023-03-15 at 13 55 53

this branch Screenshot 2023-03-15 at 13 56 01

BTW, It seem that the linting is failing.

Thank you for the catch 🙏 I might have committed a different change.

Updated in 459e4c8

@moon0326
Copy link
Contributor Author

@verofasulo Do you think it would be better to align the buttons to the bottom?

Screenshot 2023-03-15 at 14 01 23

Updated in 981f867 👍

Copy link
Contributor

@rjchow rjchow 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! Thanks for fixing this 😄

Copy link
Member

@chihsuan chihsuan left a comment

Choose a reason for hiding this comment

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

Nice! Looks good and tested well. 👍

@moon0326 moon0326 merged commit e8a00ed into trunk Mar 20, 2023
18 checks passed
@moon0326 moon0326 deleted the update/36977-visual-tweaks-for-shipping-task-partners branch March 20, 2023 04:33
@github-actions github-actions bot added this to the 7.6.0 milestone Mar 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
plugin: woocommerce Issues related to the WooCommerce Core plugin.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Visual tweaks for Shipping Task partners layout from Veronica's feedback
4 participants