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 margin in guest checkout #11302

Merged
merged 2 commits into from
Aug 2, 2023

Conversation

bouaik
Copy link
Contributor

@bouaik bouaik commented Jul 29, 2023

What? Why?

What should we test?

As per issue.

Release notes

Changelog Category: Technical changes
(DC: I chose technical because the change shouldn't have any effect on users other than looking slightly different)

The title of the pull request will be included in the release notes.

Copy link
Member

@mkllnk mkllnk left a comment

Choose a reason for hiding this comment

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

The CSS change looks good. A screenshot would have been helpful.

Copy link
Member

@dacook dacook left a comment

Choose a reason for hiding this comment

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

Thank you and welcome!

I took a look into this because I noticed that this CSS affects both the logged-in and guest views, but the issue says the problem is only on guest.

I discovered that the HTML for logged-in view is using our grid css classes (eg parent row and small-12 columns), and the guest view intends to but is broken (it's missing a parent row and the columns class).
Would you be able to have a go at fixing it that way instead? This would improve the layout on larger screens also.

Logged in:
Screen Shot 2023-08-01 at 11 19 46 am

Guest:
Screen Shot 2023-08-01 at 11 21 04 am

@bouaik
Copy link
Contributor Author

bouaik commented Aug 1, 2023

I used the same logic like in logged in checkout form, i wanted the use the classes in the edit template but i don't want to mess the divs of the stimulus tatgets

@bouaik bouaik requested a review from dacook August 1, 2023 22:20
Copy link
Member

@dacook dacook left a comment

Choose a reason for hiding this comment

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

This looks good, thank you!

It will now be checked by a tester before merging. @drummer83 would you like to pick this up?

@drummer83 drummer83 self-assigned this Aug 2, 2023
@drummer83 drummer83 added the pr-staged-au staging.openfoodnetwork.org.au label Aug 2, 2023
@drummer83
Copy link
Contributor

Hi @bouaik,
Thanks for working on this issue! 💪
I did a test of this one and here is what I found.

Before staging the PR

  • Buttons 'Login' and 'Checkout as guest' have no margin ❌
    image
  • Buttons 'Next - Payment method' and 'Back to Edit basket' have a margin ✔️
    image

After staging the PR

  • Buttons 'Login' and 'Checkout as guest' have a margin ✔️
    image
  • Buttons 'Next - Payment method' and 'Back to Edit basket' have a margin ✔️
    image
  • I also confirmed that checkout remains unaffected by these changes. ✔️

Excellent work! This is ready for merging! 🚀 🥳
Thanks again!

@drummer83 drummer83 merged commit 12f6457 into openfoodfoundation:master Aug 2, 2023
52 checks passed
@drummer83 drummer83 removed the pr-staged-au staging.openfoodnetwork.org.au label Aug 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

[Checkout, Mobile] No margin around buttons 'Login' and 'Checkout as guest'
4 participants