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

reCAPTCHA: Enrollment Success, Logged Out #2579

Merged

Conversation

machikoyasuda
Copy link
Member

@machikoyasuda machikoyasuda commented Dec 6, 2024

closes #2544

What this PR does

Enrollment Success

image

This is now the only page in the flow that isn't col-lg-6. Though, as a reminder, the home page and the Help page aren't either. The Help page will remain col-lg-8. This page doesn't by any columns on Figma, both the headline text and the image/text combo. On the app, we are using a col-lg-9 as our closest approximate.

Logged out

image

A col-lg-6 page with the now standard, 72px between header and headline, and 24px between icon and graf.

@machikoyasuda machikoyasuda self-assigned this Dec 6, 2024
@machikoyasuda machikoyasuda linked an issue Dec 6, 2024 that may be closed by this pull request
@github-actions github-actions bot added the front-end HTML/CSS/JavaScript and Django templates label Dec 6, 2024
Copy link

github-actions bot commented Dec 6, 2024

Coverage report

This PR does not seem to contain any modification to coverable code.

<div class="col-md-6">
<h1 class="h2 text-center">
<span class="d-block pb-lg-8 pb-5">{% include "core/includes/icon.html" with name="happybus" %}</span>
Copy link
Member Author

@machikoyasuda machikoyasuda Dec 6, 2024

Choose a reason for hiding this comment

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

Putting a span with a d-block to wrap an img...... so weird! Changed to a div.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, weird also that the image/icon was inside the h1. This makes way more sense 👍

@machikoyasuda machikoyasuda marked this pull request as ready for review December 6, 2024 22:05
@machikoyasuda machikoyasuda requested a review from a team as a code owner December 6, 2024 22:05
{% translate "If you are on a public or shared computer, don’t forget to sign out of " %}
{% include authentication.sign_out_button_template %}
</p>
</div>
</div>
{% endif %}
{% endblock call-to-action %}
Copy link
Member Author

Choose a reason for hiding this comment

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

The current file has the If you are on a public or shared computer.. line in the call-to-action area. But I moved it to the parent block container, inner-content instead. In the future, this will allow us to be more specific with what the call-to-action block has in it (if for example we ONLY use it for the majority case where there's just 1 big button).

Copy link
Member

Choose a reason for hiding this comment

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

Ok so I think the idea here with moving it up to inner-content was so it can be inside the <div> defined on line 27 (<div class="col-12 col-sm-12 col-lg-9">) and therefore not have to duplicate the col- classes.

Ultimately the spacing / alignment looks correct ✅ :

Before This branch
image image

Could you explain more what you mean by:

In the future, this will allow us to be more specific with what the call-to-action block has in it (if for example we ONLY use it for the majority case where there's just 1 big button).

? I'm not fully following and am curious what it means to be more specific with the call-to-action block.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sorry that line was confusing 😆 , as I'm wondering to myself what it means 😆
I'm gonna retract that statement entirely. #2583 (comment) achieved what I meant in that confusing sentence.

Instead I'm going to say, although we can put the If you are on a public computer sentence in either inner-content or call-to-action, I think we should keep it in inner-content b/c it's not really the same design/intent as the call-to-action block, which is really meant to be the container of the big CTA buttons. So it's more of a semantics decision rather than a code change.

Just in case in the future, there's some other new re-design to the call-to-action button / parent area, and we want to apply it to all the big buttons - it would be easier to do if we're only using this block only had the big buttons.

@machikoyasuda machikoyasuda force-pushed the feat/2544-recaptcha-enrollment-success branch from c892e58 to 9059962 Compare December 9, 2024 20:56
@machikoyasuda
Copy link
Member Author

@angela-tran This PR is ready for review. (Goes a little out of order from what I had listed! It's a small PR though, compared with the others).

@angela-tran
Copy link
Member

@machikoyasuda I see that this PR contains some changes that do make the code cleaner, namely the <span> cleanup. But I'm a little confused on how these changes are related to the re-designs for reCAPTCHA. I looked over the notes from the design review on 2024-11-25 and don't see anything about making the content on this page wider.

I'm not sure how to proceed with my code review of this.

@machikoyasuda
Copy link
Member Author

@angela-tran Hrm.. I'm just going by what alignment changes were made on Figma: un-centering the H1s, making sure the H1 is 72px from the top, 24px between grafs. The most visibly noticeable change is the un-centering the H1s.

@angela-tran
Copy link
Member

@angela-tran Hrm.. I'm just going by what alignment changes were made on Figma: un-centering the H1s, making sure the H1 is 72px from the top, 24px between grafs. The most visibly noticeable change is the un-centering the H1s.

Ah yeah, the headline becoming un-centered and the 24px spacing change are all from the reCAPTCHA design changes 👍 I was getting caught up in the Figma design not following the grid and calling for the content to be wider for some reason, but I guess it's fine.

Thanks for clarifying and sending me the link to the Figma diff -- it was really helpful!

Copy link
Member

@angela-tran angela-tran left a comment

Choose a reason for hiding this comment

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

Just a small change requested and a question

benefits/core/templates/core/logged-out.html Outdated Show resolved Hide resolved
{% translate "If you are on a public or shared computer, don’t forget to sign out of " %}
{% include authentication.sign_out_button_template %}
</p>
</div>
</div>
{% endif %}
{% endblock call-to-action %}
Copy link
Member

Choose a reason for hiding this comment

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

Ok so I think the idea here with moving it up to inner-content was so it can be inside the <div> defined on line 27 (<div class="col-12 col-sm-12 col-lg-9">) and therefore not have to duplicate the col- classes.

Ultimately the spacing / alignment looks correct ✅ :

Before This branch
image image

Could you explain more what you mean by:

In the future, this will allow us to be more specific with what the call-to-action block has in it (if for example we ONLY use it for the majority case where there's just 1 big button).

? I'm not fully following and am curious what it means to be more specific with the call-to-action block.

@machikoyasuda machikoyasuda merged commit 9edb893 into refactor/recaptcha-copy Dec 10, 2024
8 checks passed
@machikoyasuda machikoyasuda deleted the feat/2544-recaptcha-enrollment-success branch December 10, 2024 22:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
front-end HTML/CSS/JavaScript and Django templates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

reCAPTCHA: Enrollment success - Widen text + Logged out
3 participants