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.

Sign up for GitHub

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(storefront): BCTHEME-449 remove main tag duplicates #2032

Merged
merged 2 commits into from
Apr 14, 2021
Merged

fix(storefront): BCTHEME-449 remove main tag duplicates #2032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00adacd
fix(storefront): BCTHEME-449 remove main tag duplicates
bc-alexsaiannyi Apr 6, 2021
86d1111
Merge branch 'master' into bctheme-449
bc-alexsaiannyi Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changelog

## Draft
- Removed duplicates of main tag.[#2032](https://github.com/bigcommerce/cornerstone/pull/2032)
- Hamburger Menu Icon missing on Google AMP Pages. [#2022](https://github.com/bigcommerce/cornerstone/pull/2022)
- Wish List drop down is truncated on product page. [#2001](https://github.com/bigcommerce/cornerstone/pull/2001)
- Improve performance of analyzing homepage carousel images. [#2027](https://github.com/bigcommerce/cornerstone/pull/2027)
Expand Down
2 changes: 1 addition & 1 deletion templates/components/common/body.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<main class="body" id='main-content' role='main' data-currency-code="{{currency_selector.active_currency_code}}">
<main class="body" id="main-content" role="main" data-currency-code="{{currency_selector.active_currency_code}}">
BC-tymurbiedukhin marked this conversation as resolved.
Show resolved Hide resolved
{{#block "hero"}} {{/block}}
<div class="container">
{{#block "page"}} {{/block}}
Expand Down
4 changes: 2 additions & 2 deletions templates/pages/account/add-return.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h1 class="page-heading">{{lang 'account.returns.new_return' }}</h1>
{{> components/account/navigation account_page='returns'}}

<main class="account account--fixed account--addReturn">
<div class="account account--fixed account--addReturn">
BC-tymurbiedukhin marked this conversation as resolved.
Show resolved Hide resolved
<div class="account-body">
<section class="account-content">

Expand Down Expand Up @@ -100,7 +100,7 @@ <h3 class="account-heading">{{lang 'account.returns.from_order' id=forms.return.

</section>
</div>
</main>
</div>

{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/account/inbox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h1 class="page-heading">{{lang 'account.messages.heading' }}</h1>
{{> components/account/navigation account_page='messages'}}

<main class="account account--fixed">
<div class="account account--fixed">
<div class="account-body">
<section class="account-content">
{{#if forms.inbox.error}}
Expand All @@ -17,7 +17,7 @@ <h1 class="page-heading">{{lang 'account.messages.heading' }}</h1>
{{> components/account/messages-form}}
</section>
</div>
</main>
</div>

{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/account/orders/all.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<h1 class="page-heading">{{lang 'account.orders.heading' }}</h1>
{{> components/account/navigation account_page='orders'}}

<main class="account account--fixed">
<div class="account account--fixed">
<div class="account-head">
{{#if customer.store_credit.value '>' 0}}
<div class="alertBox alertBox--storeCredit">
Expand All @@ -28,7 +28,7 @@ <h1 class="page-heading">{{lang 'account.orders.heading' }}</h1>
{{/if}}
</section>
</div>
</main>
</div>

{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/account/returns.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h1 class="page-heading">{{lang 'account.returns.heading' }}</h1>
{{> components/account/navigation account_page='returns'}}

<main class="account account--fixed">
<div class="account account--fixed">
<div class="account-body">
<section class="account-content">
{{#if customer.returns}}
Expand All @@ -14,7 +14,7 @@ <h1 class="page-heading">{{lang 'account.returns.heading' }}</h1>
{{/if}}
</section>
</div>
</main>
</div>

{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/amp/category.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ <h1 class="categoryView-title">
{{category.name}}
</h1>
</div>
<main class="page-content" id="product-listing-container">
<div class="page-content" id="product-listing-container">
BC-tymurbiedukhin marked this conversation as resolved.
Show resolved Hide resolved
{{#if category.products}}
{{> components/amp/category/product-listing}}
{{else}}
<p>{{lang 'categories.no_products'}}</p>
{{/if}}
</main>
</div>
{{> components/amp/category/subcategories}}
{{> components/amp/common/footer}}
{{#if settings.amp_analytics_id}}
Expand Down
4 changes: 2 additions & 2 deletions templates/pages/auth/account-created.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{{#partial "page"}}
<section class="page">
<main class="page-content page-content--textCenter">
<div class="page-content page-content--textCenter">
<h1 class="page-heading">{{lang 'create_account.created.heading'}}</h1>
<p>{{{lang 'create_account.created.intro' store_name=settings.store_name email=customer.email}}}</p>
<a class="button button--primary" href="{{create_account.continue_url}}">{{lang 'create_account.created.continue'}}</a>
</main>
</div>
</section>
{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/blog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

{{> components/common/breadcrumbs breadcrumbs=breadcrumbs}}

<main class="page">
<section class="page">
{{#unless theme_settings.hide_blog_page_heading }}
<h1 class="page-heading">{{ blog.name }}</h1>
{{/unless}}
Expand All @@ -19,7 +19,7 @@ <h1 class="page-heading">{{ blog.name }}</h1>
{{/each}}

{{> components/common/paginator pagination.blog}}
</main>
</section>

{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/brand.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h1 class="page-heading">{{brand.name}}</h1>
{{> components/brand/sidebar}}
</aside>

<main class="page-content" id="product-listing-container">
<div class="page-content" id="product-listing-container">
{{#if brand.search_error }}
<p>{{lang 'search.errorMessage'}}</p>
{{else}}
Expand All @@ -42,7 +42,7 @@ <h1 class="page-heading">{{brand.name}}</h1>
{{/if}}
{{{region name="brand_below_content"}}}
{{/if}}
</main>
</div>
</div>

{{/partial}}
Expand Down
4 changes: 2 additions & 2 deletions templates/pages/brands.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

{{> components/common/breadcrumbs breadcrumbs=breadcrumbs}}

<main class="page">
<section class="page">
<h1 class="page-heading">{{lang 'brand.label'}}</h1>
{{{region name="brands_below_header"}}}
<ul class="brandGrid">
Expand Down Expand Up @@ -37,6 +37,6 @@ <h3 class="card-title">
</ul>
{{> components/common/paginator pagination.brands}}
{{{region name="brands_below_content"}}}
</main>
</section>
{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/cart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{#partial "page"}}
<div class="page">

<main class="page-content" data-cart>
<div class="page-content" data-cart>
{{> components/common/breadcrumbs breadcrumbs=breadcrumbs}}

{{> components/cart/page-title}}
Expand Down Expand Up @@ -52,7 +52,7 @@
<h3 tabindex="0">{{lang 'cart.checkout.empty_cart'}}</h3>
{{/if}}

</main>
</div>
</div>
{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/category.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ <h1 class="page-heading">{{category.name}}</h1>
{{/if}}
{{/if}}

<main class="page-content" id="product-listing-container">
<div class="page-content" id="product-listing-container">
{{> components/category/product-listing}}
{{{region name="category_below_content"}}}
</main>
</div>
</div>

{{/partial}}
Expand Down
4 changes: 2 additions & 2 deletions templates/pages/compare.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{> components/common/breadcrumbs breadcrumbs=breadcrumbs}}
<h1 class="page-heading">{{lang 'compare.header' products=comparisons.length}}</h1>
<div class="page">
<main class="page-content">
<div class="page-content">

<table class="compareTable">
<tr class="compareTable-row">
Expand Down Expand Up @@ -136,7 +136,7 @@ <h3 class="card-title">
</tr>
</table>

</main>
</div>
</div>

{{/partial}}
Expand Down
4 changes: 2 additions & 2 deletions templates/pages/contact-us.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{> components/common/breadcrumbs breadcrumbs=breadcrumbs}}

<main class="page">
<section class="page">
{{#unless theme_settings.hide_contact_us_page_heading }}
<h1 class="page-heading">{{page.title}}</h1>
{{/unless}}
Expand All @@ -27,7 +27,7 @@ <h1 class="page-heading">{{page.title}}</h1>

</div>

</main>
</section>

{{/partial}}

Expand Down
4 changes: 2 additions & 2 deletions templates/pages/errors/403.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{> components/common/breadcrumbs breadcrumbs=breadcrumbs}}

<main class="page">
<div class="page">
<section class="page-content page-content--centered">
<h1 class="page-heading">{{lang 'forbidden.page_heading'}}</h1>
<p class="u-textAlignCenter">
Expand All @@ -12,7 +12,7 @@ <h1 class="page-heading">{{lang 'forbidden.page_heading'}}</h1>
</p>
{{> components/common/search-box}}
</section>
</main>
</div>

{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/errors/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{> components/common/breadcrumbs breadcrumbs=breadcrumbs}}

<main class="page">
<div class="page">
<section class="page-content page-content--centered">
<h1 class="page-heading">{{lang 'page_not_found.page_heading'}}</h1>
<p class="u-textAlignCenter">
Expand All @@ -11,7 +11,7 @@ <h1 class="page-heading">{{lang 'page_not_found.page_heading'}}</h1>

{{> components/common/search-box}}
</section>
</main>
</div>

{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/errors/generic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{{#partial "page"}}

<main class="page">
<div class="page">
<section class="page-content page-content--centered">
<h1 class="page-heading">{{lang 'server_error.page_heading'}}</h1>
<p class="u-textAlignCenter">
{{lang 'server_error.message'}}
</p>
</section>
</main>
</div>

{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/gift-certificate/balance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h1 class="page-heading">{{lang 'gift_certificate.heading' }}</h1>
{{> components/gift-certificate/navigation gift_page='balance'}}

<main class="account account--fixed">
<div class="account account--fixed">
<h3>{{lang 'gift_certificate.balance.heading'}}</h3>
<p>
<strong>{{lang 'gift_certificate.balance.intro' }}</strong>
Expand All @@ -31,6 +31,6 @@ <h3>{{gift_certificate.code}}</h3>
</div>
</div>
</form>
</main>
</div>
{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/gift-certificate/purchase.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h1 class="page-heading">{{lang 'gift_certificate.heading' }}</h1>
{{> components/gift-certificate/navigation gift_page='purchase'}}

<main class="account account--fixed">
<div class="account account--fixed">

{{#each forms.gift_certificate.errors}}
{{> components/common/alert/alert-error this}}
Expand Down Expand Up @@ -120,6 +120,6 @@ <h1 class="page-heading">{{lang 'gift_certificate.heading' }}</h1>
value="{{lang 'forms.gift_certificate.purchase.submit_value' }}">
</div>
</form>
</main>
</div>
{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/gift-certificate/redeem.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h1 class="page-heading">{{lang 'gift_certificate.heading' }}</h1>
{{> components/gift-certificate/navigation gift_page='redeem'}}

<main class="account account--fixed">
<div class="account account--fixed">
<h3>{{lang 'gift_certificate.redeem.heading'}}</h3>
<p><strong>{{lang 'gift_certificate.redeem.intro' store_name=settings.store_name }}</strong></p>
<ol>
Expand All @@ -13,6 +13,6 @@ <h3>{{lang 'gift_certificate.redeem.heading'}}</h3>
<li>{{{lang 'gift_certificate.redeem.item3' cart_url=urls.cart }}}</li>
<li>{{lang 'gift_certificate.redeem.item4' }}</li>
</ol>
</main>
</div>
{{/partial}}
{{> layout/base}}
4 changes: 2 additions & 2 deletions templates/pages/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{> components/common/breadcrumbs breadcrumbs=breadcrumbs}}

<main class="page">
<section class="page">
{{#unless theme_settings.hide_page_heading }}
<h1 class="page-heading">{{ page.title }}</h1>
{{/unless}}
Expand Down Expand Up @@ -37,7 +37,7 @@ <h6><a href="{{url}}" target="_blank">{{title}}</a></h6>
{{/each}}
</ul>
{{/if}}
</main>
</section>

{{/partial}}

Expand Down
4 changes: 2 additions & 2 deletions templates/pages/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
{{> components/faceted-search/index product_results}}
</aside>
{{/if}}
<main class="page-content">
<div class="page-content">
{{#if forms.search.has_suggestions}}
<div class="panel panel--large">
<div class="panel-body">
Expand Down Expand Up @@ -142,7 +142,7 @@ <h5 class="suggestion-title">{{lang 'forms.search.suggestions.title'}}</h5>
</div>

{{{region name="search_below_content"}}}
</main>
</div>
</section>

{{/partial}}
Expand Down