Skip to content

Commit

Permalink
fix(storefront): Prevent flow outside page container on account pages (
Browse files Browse the repository at this point in the history
…#2462)

* Add account-content wrapper so content doesn't flow outside page container

* Update changelog

* Remove newline

---------

Co-authored-by: Volodymyr Krasnoshapka <88093058+BC-krasnoshapka@users.noreply.github.com>
  • Loading branch information
pvaladez and BC-krasnoshapka authored May 23, 2024
1 parent 7b738c0 commit 854cdfc
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 20 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Draft
- Prevent flow outside page container on account pages [#2462](https://github.com/bigcommerce/cornerstone/pull/2462)
- Account.js - Fixed jquery selector to be template literal [#2464](https://github.com/bigcommerce/cornerstone/pull/2464)

## 6.14.0 (05-15-2024)
Expand Down
38 changes: 19 additions & 19 deletions templates/pages/account/add-address.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@ <h2 class="page-heading">{{lang 'forms.address.add.heading'}}</h2>
{{/if}}

<div class="account-body">

<form action="{{forms.address.action}}" data-address-form class="form" method="post">
{{#if forms.address.address_id }}
<input type="hidden" name="shipid" value="{{forms.address.address_id}}">
{{/if}}
<fieldset class="form-fieldset">
<div class="form-row form-row--half">
{{#each forms.address.shipping_fields }}
{{{dynamicComponent 'components/common/forms'}}}
{{/each}}
<section class="account-content">
<form action="{{forms.address.action}}" data-address-form class="form" method="post">
{{#if forms.address.address_id }}
<input type="hidden" name="shipid" value="{{forms.address.address_id}}">
{{/if}}
<fieldset class="form-fieldset">
<div class="form-row form-row--half">
{{#each forms.address.shipping_fields }}
{{{dynamicComponent 'components/common/forms'}}}
{{/each}}
</div>
</fieldset>
<div class="form-actions">
<input type="submit" class="button button--primary" value="{{lang 'forms.address.submit_value'}}">
<a href="{{urls.account.addresses}}" class="button">{{lang 'common.cancel'}}</a>
{{inject 'required' (lang 'common.required')}}
{{inject 'state_error' (lang 'errors.state_error')}}
</div>
</fieldset>
<div class="form-actions">
<input type="submit" class="button button--primary" value="{{lang 'forms.address.submit_value'}}">
<a href="{{urls.account.addresses}}" class="button">{{lang 'common.cancel'}}</a>
{{inject 'required' (lang 'common.required')}}
{{inject 'state_error' (lang 'errors.state_error')}}
</div>
</form>

</form>
</section>
</div>
</div>

Expand Down
4 changes: 3 additions & 1 deletion templates/pages/account/addresses.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ <h2 class="page-heading">{{lang 'account.addresses.heading' }}</h2>
{{#if customer.success}}
{{>components/common/alert/alert-success customer.success}}
{{/if}}
{{> components/account/address-list }}
<section class="account-content">
{{> components/account/address-list }}
</section>
</div>
</div>
{{/partial}}
Expand Down

0 comments on commit 854cdfc

Please sign in to comment.