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

Subscriptions: Fix Subscribed button alignment #37066

Merged
merged 8 commits into from
Apr 30, 2024
Merged

Conversation

pkuliga
Copy link
Contributor

@pkuliga pkuliga commented Apr 25, 2024

For some themes (especially Lettre) the "✓ Subscribed" button alignment had some issues, like the button label was not centered or the button was too wide.

Proposed changes:

It fixes the "✓ Subscribed" alignment by centering it vertically and removing the custom width.

"Lettre" theme

Before

Screenshot 2024-04-25 at 09 06 00

After

Screenshot 2024-04-25 at 09 05 37

There should be no difference for themes where those issues didn't occur, like "Twenty Twenty-Four".

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

  • Subscribe to the blog using the Subscribe block
  • Make sure the "✓ Subscribed" button rendered by the Subscribe block looks as expected
  • Check different themes

Copy link
Contributor

github-actions bot commented Apr 25, 2024

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the update/subscribe-centered branch.

  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack update/subscribe-centered
    

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@github-actions github-actions bot added [Block] Subscriptions [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Status] In Progress labels Apr 25, 2024
Copy link
Contributor

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.


Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

  • WordPress.com Simple releases happen daily.
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly. The next release is scheduled for May 7, 2024 (scheduled code freeze on May 6, 2024).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

@pkuliga pkuliga marked this pull request as ready for review April 25, 2024 07:17
@@ -720,7 +720,7 @@ function render_for_website( $data, $classes, $styles ) {
<div <?php echo wp_kses_data( $data['wrapper_attributes'] ); ?>>
<div class="wp-block-jetpack-subscriptions__container<?php echo ! $is_subscribed ? ' is-not-subscriber' : ''; ?>">
<?php if ( is_top_subscription() ) : ?>
<p id="subscribe-submit"
<p id="subscribe-link"
Copy link
Member

Choose a reason for hiding this comment

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

How come we use ID here instead of class? 🤔 Makes me thinking something is using to scroll to it later on.

Not a super biggie, but ID is also problematic for having multiple blocks on the page since there should always be just one unique ID per page load.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agree, but at the same time, I want to be consistent with the rest of the code.

Not sure why we have IDs there. I prefer to remove them in a separate PR if we want to do it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are already some styles attached to it in premium themes:
fbhepr%2Sfrnepu%3Sshyy%3Q%2522fhofpevor%2Qfhozvg%2522%26qrsf%3Q%26ersf%3Q%26cngu%3Q%26uvfg%3Q%26glcr%3Q%26keq%3Q%26aa%3Q17%26fv%3Qshyy%26frnepunyy%3Qgehr%26fv%3Qshyy-og

Copy link
Member

Choose a reason for hiding this comment

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

Can we keep the submit ID but start using something else for this new case? E.g. is-subscribed class?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Like the idea, will try that 👍

@simison
Copy link
Member

simison commented Apr 25, 2024

Results are pretty good with my test post:

Editor

Screenshot 2024-04-25 at 11 09 39

Before PR

Screenshot 2024-04-25 at 11 09 51

After PR

Screenshot 2024-04-25 at 11 10 08

Last block especially is interesting; it's set to 100% width with the button on new line, and it now behaves more like I'd expect.

The other examples with button on "new line" don't look so great tho. We should probably skip the centering on those? They're effectively "left aligned" style.

@pkuliga
Copy link
Contributor Author

pkuliga commented Apr 26, 2024

Thanks for testing @simison! I applied some fixes, could you take a look once more?

How do I get the "Narrow example"? I didn't test this one since I don't know how to create it.

@pkuliga pkuliga requested review from simison and a team April 30, 2024 10:01
@simison
Copy link
Member

simison commented Apr 30, 2024

Narrow example was just Subscribe block with button on new line inside a 50/50 column:

image

Copy link
Member

@simison simison left a comment

Choose a reason for hiding this comment

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

Aight, it's looking good now.

@pkuliga pkuliga merged commit 5da0a88 into trunk Apr 30, 2024
56 checks passed
@pkuliga pkuliga deleted the update/subscribe-centered branch April 30, 2024 15:02
@github-actions github-actions bot added this to the jetpack/13.4 milestone Apr 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Block] Subscriptions [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants