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

Remove the override css for the express payment grid. #9248

Merged
merged 5 commits into from
Sep 3, 2024

Conversation

alexflorisca
Copy link
Member

@alexflorisca alexflorisca commented Aug 12, 2024

Changes proposed in this Pull Request

As part of the ECE work, a temporary override was added to change the express payment grid to support larger buttons. This has now been fixed in Woo Core in woocommerce/woocommerce#49304. This PR removes the unnecessary CSS.

Screenshot 2024-08-12 at 15 08 49

Testing instructions

  1. Load the checkout block with some express payment methods
  2. Button containers should have a minimum of 240px width.

  • Run npm run changelog to add a changelog file, choose patch to leave it empty if the change is not significant. You can add multiple changelog files in one PR by running this command a few times.
  • Covered with tests (or have a good reason not to test in description ☝️)
  • Tested on mobile (or does not apply)

Post merge

@botwoo
Copy link
Collaborator

botwoo commented Aug 12, 2024

Test the build

Option 1. Jetpack Beta

  • Install and activate Jetpack Beta.
  • Use this build by searching for PR number 9248 or branch name remove/override-for-express-payment-grid in your-test.site/wp-admin/admin.php?page=jetpack-beta&plugin=woocommerce-payments

Option 2. Jurassic Ninja - available for logged-in A12s

🚀 Launch a JN site with this branch 🚀

ℹ️ Install this Tampermonkey script to get more options.


Build info:

  • Latest commit: e5f0585
  • Build time: 2024-09-02 10:47:32 UTC

Note: the build is updated when a new commit is pushed to this PR.

Copy link
Contributor

github-actions bot commented Aug 12, 2024

Size Change: +162 B (0%)

Total Size: 1.32 MB

Filename Size Change
release/woocommerce-payments/dist/blocks-checkout-rtl.css 2.4 kB -48 B (-2%)
release/woocommerce-payments/dist/blocks-checkout.css 2.4 kB -47 B (-2%)
release/woocommerce-payments/dist/blocks-checkout.js 65.8 kB +6 B (0%)
release/woocommerce-payments/dist/index.js 298 kB +18 B (0%)
release/woocommerce-payments/dist/multi-currency-switcher-block.js 60.5 kB +17 B (0%)
release/woocommerce-payments/dist/multi-currency.js 55.5 kB +28 B (0%)
release/woocommerce-payments/dist/order.js 42.7 kB +26 B (0%)
release/woocommerce-payments/dist/payment-gateways.js 39.3 kB +26 B (0%)
release/woocommerce-payments/dist/product-details.js 11.5 kB +44 B (0%)
release/woocommerce-payments/dist/settings.js 224 kB +74 B (0%)
release/woocommerce-payments/dist/woopay-express-button.js 24 kB +7 B (0%)
release/woocommerce-payments/dist/woopay.js 71.3 kB +11 B (0%)
ℹ️ View Unchanged
Filename Size
release/woocommerce-payments/assets/css/admin.css 1.08 kB
release/woocommerce-payments/assets/css/admin.rtl.css 1.08 kB
release/woocommerce-payments/assets/css/success.css 173 B
release/woocommerce-payments/assets/css/success.rtl.css 173 B
release/woocommerce-payments/dist/cart-block.js 16.3 kB
release/woocommerce-payments/dist/cart.js 5.73 kB
release/woocommerce-payments/dist/checkout-rtl.css 817 B
release/woocommerce-payments/dist/checkout.css 816 B
release/woocommerce-payments/dist/checkout.js 32.5 kB
release/woocommerce-payments/dist/express-checkout-rtl.css 240 B
release/woocommerce-payments/dist/express-checkout.css 240 B
release/woocommerce-payments/dist/express-checkout.js 14.1 kB
release/woocommerce-payments/dist/frontend-tracks.js 858 B
release/woocommerce-payments/dist/index-rtl.css 39.2 kB
release/woocommerce-payments/dist/index.css 39.2 kB
release/woocommerce-payments/dist/multi-currency-analytics.js 1.08 kB
release/woocommerce-payments/dist/multi-currency-rtl.css 3.41 kB
release/woocommerce-payments/dist/multi-currency.css 3.41 kB
release/woocommerce-payments/dist/order-rtl.css 730 B
release/woocommerce-payments/dist/order.css 730 B
release/woocommerce-payments/dist/payment-gateways-rtl.css 1.35 kB
release/woocommerce-payments/dist/payment-gateways.css 1.35 kB
release/woocommerce-payments/dist/payment-request-rtl.css 240 B
release/woocommerce-payments/dist/payment-request.css 240 B
release/woocommerce-payments/dist/payment-request.js 13.7 kB
release/woocommerce-payments/dist/plugins-page-rtl.css 386 B
release/woocommerce-payments/dist/plugins-page.css 386 B
release/woocommerce-payments/dist/plugins-page.js 20.1 kB
release/woocommerce-payments/dist/product-details-rtl.css 433 B
release/woocommerce-payments/dist/product-details.css 436 B
release/woocommerce-payments/dist/settings-rtl.css 11.6 kB
release/woocommerce-payments/dist/settings.css 11.5 kB
release/woocommerce-payments/dist/subscription-edit-page.js 703 B
release/woocommerce-payments/dist/subscription-product-onboarding-modal-rtl.css 524 B
release/woocommerce-payments/dist/subscription-product-onboarding-modal.css 524 B
release/woocommerce-payments/dist/subscription-product-onboarding-modal.js 20.2 kB
release/woocommerce-payments/dist/subscription-product-onboarding-toast.js 730 B
release/woocommerce-payments/dist/subscriptions-empty-state-rtl.css 120 B
release/woocommerce-payments/dist/subscriptions-empty-state.css 120 B
release/woocommerce-payments/dist/subscriptions-empty-state.js 19.3 kB
release/woocommerce-payments/dist/tokenized-payment-request-rtl.css 240 B
release/woocommerce-payments/dist/tokenized-payment-request.css 240 B
release/woocommerce-payments/dist/tokenized-payment-request.js 14.5 kB
release/woocommerce-payments/dist/tos-rtl.css 235 B
release/woocommerce-payments/dist/tos.css 235 B
release/woocommerce-payments/dist/tos.js 21.8 kB
release/woocommerce-payments/dist/woopay-direct-checkout.js 6.14 kB
release/woocommerce-payments/dist/woopay-rtl.css 4.54 kB
release/woocommerce-payments/dist/woopay.css 4.51 kB
release/woocommerce-payments/includes/subscriptions/assets/css/plugin-page.css 625 B
release/woocommerce-payments/includes/subscriptions/assets/js/plugin-page.js 814 B
release/woocommerce-payments/vendor/automattic/jetpack-assets/build/i18n-loader.js 2.46 kB
release/woocommerce-payments/vendor/automattic/jetpack-assets/build/jetpack-script-data.js 737 B
release/woocommerce-payments/vendor/automattic/jetpack-assets/build/react-jsx-runtime.js 554 B
release/woocommerce-payments/vendor/automattic/jetpack-assets/src/js/i18n-loader.js 1.02 kB
release/woocommerce-payments/vendor/automattic/jetpack-assets/src/js/script-data.js 69 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/babel.config.js 163 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/identity-crisis.css 2.45 kB
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/identity-crisis.js 14.2 kB
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/identity-crisis.rtl.css 2.45 kB
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/jetpack-sso-admin-create-user.css 198 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/jetpack-sso-admin-create-user.js 280 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/jetpack-sso-admin-create-user.rtl.css 198 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/jetpack-sso-login.css 625 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/jetpack-sso-login.js 333 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/jetpack-sso-login.rtl.css 626 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/jetpack-sso-users.js 417 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/tracks-ajax.js 521 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/tracks-callables.js 584 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/src/sso/jetpack-sso-admin-create-user.css 215 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/src/sso/jetpack-sso-admin-create-user.js 521 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/src/sso/jetpack-sso-login.css 721 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/src/sso/jetpack-sso-login.js 412 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/src/sso/jetpack-sso-users.js 621 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/about.css 1.04 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/admin-empty-state.css 294 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/admin-order-statuses.css 408 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/admin.css 3.59 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/checkout.css 301 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/modal.css 746 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/view-subscription.css 574 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/wcs-upgrade.css 414 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/admin-pointers.js 543 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/admin.js 9.4 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/jstz.js 6.78 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/jstz.min.js 3.84 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/meta-boxes-coupon.js 545 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/meta-boxes-subscription.js 2.52 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/moment.js 22.2 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/moment.min.js 11.7 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/payment-method-restrictions.js 1.29 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/wcs-meta-boxes-order.js 507 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/payment-methods.js 358 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/single-product.js 428 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/view-subscription.js 1.38 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/wcs-cart.js 782 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/modal.js 1.09 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/wcs-upgrade.js 1.26 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/build/index.css 391 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/build/index.js 3.04 kB

compressed-size-action

@alexflorisca alexflorisca requested review from a team and cesarcosta99 and removed request for a team August 19, 2024 15:52
@cesarcosta99 cesarcosta99 requested review from asumaran and removed request for cesarcosta99 August 19, 2024 19:38
@asumaran
Copy link
Contributor

@alexflorisca, could you please fix the conflicts here? I modified one of the files you’re updating. I wouldn't delete the client/express-checkout/blocks/express-checkout-element.scss file, as I’m sure it’s needed now.

I suggest double-checking your changes, as I worked on the spacing and alignment of the express checkout buttons on all pages. Let me know if you still need this PR reviewed.

@alexflorisca
Copy link
Member Author

alexflorisca commented Aug 20, 2024

Thanks @asumaran, fixed the conflict, left the sass file there. Is there a reason why you override the grid-gap to 12px there?

@asumaran
Copy link
Contributor

Is there a reason why you override the grid-gap to 12px there?

@alexflorisca 12px was defined here #9169 (comment)

@asumaran
Copy link
Contributor

@alexflorisca do you drill want me to review this PR?

@asumaran
Copy link
Contributor

asumaran commented Aug 27, 2024

Closing this PR as @pierorocca has confirmed that we will use 12px spacing for the Express Checkout buttons

@asumaran asumaran closed this Aug 27, 2024
@alexflorisca
Copy link
Member Author

Sorry for the delay in responding to this. I think it would be helpful not to have the override here. I've edited the code in Core to have a grid gap of 12px in Small updates to the express checkout area. It would be good if we can coordinate these changes so they just live in one place rather than overriding styles. Other extensions may do the same which we don't want.

@alexflorisca alexflorisca reopened this Aug 28, 2024
Copy link
Contributor

@asumaran asumaran left a comment

Choose a reason for hiding this comment

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

@alexflorisca this PR breaks the spacing and alignment of Express Checkout buttons.

Removing the import makes the space to be 16px on Express Checkout buttons on the Cart Block page. I've tested with the latest WooCommerce 9.2.3.

Screenshot 2024-08-28 at 11 18 16 AM

It should be 12px as it is with the import:

Screenshot 2024-08-28 at 11 21 39 AM

And removing the CSS declaration from the client/express-checkout/blocks/express-checkout-element.scss file breaks the button alignment on the Checkout Block page.

Screen.Recording.2024-08-28.at.11.10.07.AM.mov

@alexflorisca
Copy link
Member Author

alexflorisca commented Aug 29, 2024

I don't think this has been released yet, I've only merged it a couple of days ago. Can you test with latest trunk?

Copy link
Contributor

@asumaran asumaran left a comment

Choose a reason for hiding this comment

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

@alexflorisca I've tested with WooCommerce's trunk branch this time and still found an issue.

@@ -9,7 +9,6 @@ import { Elements } from '@stripe/react-stripe-js';
*/
import ExpressCheckoutComponent from './express-checkout-component';
import { getExpressCheckoutButtonAppearance } from 'wcpay/express-checkout/utils';
import '../express-checkout-element.scss';
Copy link
Contributor

Choose a reason for hiding this comment

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

Before After
Screenshot 2024-08-29 at 11 57 31 PM Screenshot 2024-08-29 at 11 56 22 PM

Removing the CSS import also removes the CSS rules for the Cart block page, which reverts the spacing back to 16px. So, we either fix the spacing in WooCommerce Core or leave the import for now.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch. I've left the import in. I initially remove it as the code I removed was the only thing in it!

@@ -14,14 +14,3 @@
margin: 24px 0 !important;
height: 20px;
}

// Checkout Block
.wc-block-components-express-payment--checkout {
Copy link
Contributor

Choose a reason for hiding this comment

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

Removing this looks fine with trunk now that the mininum with of the grid is set to 240px by WC core. 👍

Copy link
Contributor

@asumaran asumaran left a comment

Choose a reason for hiding this comment

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

LGTM

@alexflorisca alexflorisca added this pull request to the merge queue Sep 3, 2024
Merged via the queue into develop with commit 0bd29ce Sep 3, 2024
23 checks passed
@alexflorisca alexflorisca deleted the remove/override-for-express-payment-grid branch September 3, 2024 09:46
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