diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f199243c8..05df2fdf78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/templates/components/common/body.html b/templates/components/common/body.html index 37249490b2..a292afad97 100644 --- a/templates/components/common/body.html +++ b/templates/components/common/body.html @@ -1,4 +1,4 @@ -
+
{{#block "hero"}} {{/block}}
{{#block "page"}} {{/block}} diff --git a/templates/pages/account/add-return.html b/templates/pages/account/add-return.html index 4566684b73..2dd81f5958 100644 --- a/templates/pages/account/add-return.html +++ b/templates/pages/account/add-return.html @@ -4,7 +4,7 @@

{{lang 'account.returns.new_return' }}

{{> components/account/navigation account_page='returns'}} -
+
+
{{/partial}} {{> layout/base}} diff --git a/templates/pages/account/inbox.html b/templates/pages/account/inbox.html index a7a576c5cb..ddb19d4ba4 100644 --- a/templates/pages/account/inbox.html +++ b/templates/pages/account/inbox.html @@ -4,7 +4,7 @@

{{lang 'account.messages.heading' }}

{{> components/account/navigation account_page='messages'}} -
+
+ {{/partial}} {{> layout/base}} diff --git a/templates/pages/account/orders/all.html b/templates/pages/account/orders/all.html index 524e2415ba..5a7aa8c744 100644 --- a/templates/pages/account/orders/all.html +++ b/templates/pages/account/orders/all.html @@ -10,7 +10,7 @@

{{lang 'account.orders.heading' }}

{{> components/account/navigation account_page='orders'}} -
+
+ {{/partial}} {{> layout/base}} diff --git a/templates/pages/account/returns.html b/templates/pages/account/returns.html index 15047bf7c1..375885f0a1 100644 --- a/templates/pages/account/returns.html +++ b/templates/pages/account/returns.html @@ -4,7 +4,7 @@

{{lang 'account.returns.heading' }}

{{> components/account/navigation account_page='returns'}} -
+
+ {{/partial}} {{> layout/base}} diff --git a/templates/pages/amp/category.html b/templates/pages/amp/category.html index a259ae071b..c4b10c91f4 100644 --- a/templates/pages/amp/category.html +++ b/templates/pages/amp/category.html @@ -28,13 +28,13 @@

{{category.name}}

-
+
{{#if category.products}} {{> components/amp/category/product-listing}} {{else}}

{{lang 'categories.no_products'}}

{{/if}} -
+ {{> components/amp/category/subcategories}} {{> components/amp/common/footer}} {{#if settings.amp_analytics_id}} diff --git a/templates/pages/auth/account-created.html b/templates/pages/auth/account-created.html index 7bd1655da7..1971548d36 100644 --- a/templates/pages/auth/account-created.html +++ b/templates/pages/auth/account-created.html @@ -1,10 +1,10 @@ {{#partial "page"}}
-
+

{{lang 'create_account.created.heading'}}

{{{lang 'create_account.created.intro' store_name=settings.store_name email=customer.email}}}

{{lang 'create_account.created.continue'}} -
+
{{/partial}} {{> layout/base}} diff --git a/templates/pages/blog.html b/templates/pages/blog.html index 2fc35a7bc9..0e07f6ee86 100644 --- a/templates/pages/blog.html +++ b/templates/pages/blog.html @@ -9,7 +9,7 @@ {{> components/common/breadcrumbs breadcrumbs=breadcrumbs}} -
+
{{#unless theme_settings.hide_blog_page_heading }}

{{ blog.name }}

{{/unless}} @@ -19,7 +19,7 @@

{{ blog.name }}

{{/each}} {{> components/common/paginator pagination.blog}} -
+ {{/partial}} {{> layout/base}} diff --git a/templates/pages/brand.html b/templates/pages/brand.html index a9e8a67ebd..99b4af4160 100644 --- a/templates/pages/brand.html +++ b/templates/pages/brand.html @@ -31,7 +31,7 @@

{{brand.name}}

{{> components/brand/sidebar}} -
+
{{#if brand.search_error }}

{{lang 'search.errorMessage'}}

{{else}} @@ -42,7 +42,7 @@

{{brand.name}}

{{/if}} {{{region name="brand_below_content"}}} {{/if}} -
+ {{/partial}} diff --git a/templates/pages/brands.html b/templates/pages/brands.html index df8dd36d66..34e4cb51b1 100644 --- a/templates/pages/brands.html +++ b/templates/pages/brands.html @@ -6,7 +6,7 @@ {{> components/common/breadcrumbs breadcrumbs=breadcrumbs}} -
+

{{lang 'brand.label'}}

{{{region name="brands_below_header"}}}
    @@ -37,6 +37,6 @@

{{> components/common/paginator pagination.brands}} {{{region name="brands_below_content"}}} -
+ {{/partial}} {{> layout/base}} diff --git a/templates/pages/cart.html b/templates/pages/cart.html index 2e56444b66..9831d27689 100644 --- a/templates/pages/cart.html +++ b/templates/pages/cart.html @@ -4,7 +4,7 @@ {{#partial "page"}}
-
+
{{> components/common/breadcrumbs breadcrumbs=breadcrumbs}} {{> components/cart/page-title}} @@ -52,7 +52,7 @@

{{lang 'cart.checkout.empty_cart'}}

{{/if}} -
+
{{/partial}} {{> layout/base}} diff --git a/templates/pages/category.html b/templates/pages/category.html index a6334b05ab..570a093b9e 100644 --- a/templates/pages/category.html +++ b/templates/pages/category.html @@ -48,10 +48,10 @@

{{category.name}}

{{/if}} {{/if}} -
+
{{> components/category/product-listing}} {{{region name="category_below_content"}}} -
+ {{/partial}} diff --git a/templates/pages/compare.html b/templates/pages/compare.html index 05f518ce2c..707d15b042 100644 --- a/templates/pages/compare.html +++ b/templates/pages/compare.html @@ -4,7 +4,7 @@ {{> components/common/breadcrumbs breadcrumbs=breadcrumbs}}

{{lang 'compare.header' products=comparisons.length}}

-
+
@@ -136,7 +136,7 @@

-
+
{{/partial}} diff --git a/templates/pages/contact-us.html b/templates/pages/contact-us.html index 69d182a5ae..93ca3877f1 100644 --- a/templates/pages/contact-us.html +++ b/templates/pages/contact-us.html @@ -2,7 +2,7 @@ {{> components/common/breadcrumbs breadcrumbs=breadcrumbs}} -
+
{{#unless theme_settings.hide_contact_us_page_heading }}

{{page.title}}

{{/unless}} @@ -27,7 +27,7 @@

{{page.title}}

-
+ {{/partial}} diff --git a/templates/pages/errors/403.html b/templates/pages/errors/403.html index 465347bb2a..c632d25f71 100644 --- a/templates/pages/errors/403.html +++ b/templates/pages/errors/403.html @@ -2,7 +2,7 @@ {{> components/common/breadcrumbs breadcrumbs=breadcrumbs}} -
+

{{lang 'forbidden.page_heading'}}

@@ -12,7 +12,7 @@

{{lang 'forbidden.page_heading'}}

{{> components/common/search-box}}
-
+ {{/partial}} {{> layout/base}} diff --git a/templates/pages/errors/404.html b/templates/pages/errors/404.html index 25c60dec9f..582a714f3d 100644 --- a/templates/pages/errors/404.html +++ b/templates/pages/errors/404.html @@ -2,7 +2,7 @@ {{> components/common/breadcrumbs breadcrumbs=breadcrumbs}} -
+

{{lang 'page_not_found.page_heading'}}

@@ -11,7 +11,7 @@

{{lang 'page_not_found.page_heading'}}

{{> components/common/search-box}}
-
+ {{/partial}} {{> layout/base}} diff --git a/templates/pages/errors/generic.html b/templates/pages/errors/generic.html index 84a05925ca..65f37caa27 100644 --- a/templates/pages/errors/generic.html +++ b/templates/pages/errors/generic.html @@ -1,13 +1,13 @@ {{#partial "page"}} -
+

{{lang 'server_error.page_heading'}}

{{lang 'server_error.message'}}

-
+ {{/partial}} {{> layout/base}} diff --git a/templates/pages/gift-certificate/balance.html b/templates/pages/gift-certificate/balance.html index ffbf701e7a..c340f431aa 100644 --- a/templates/pages/gift-certificate/balance.html +++ b/templates/pages/gift-certificate/balance.html @@ -4,7 +4,7 @@

{{lang 'gift_certificate.heading' }}

{{> components/gift-certificate/navigation gift_page='balance'}} -
+ -
+ {{/partial}} {{> layout/base}} diff --git a/templates/pages/gift-certificate/purchase.html b/templates/pages/gift-certificate/purchase.html index 3bb12bfb40..e210a1b214 100644 --- a/templates/pages/gift-certificate/purchase.html +++ b/templates/pages/gift-certificate/purchase.html @@ -4,7 +4,7 @@

{{lang 'gift_certificate.heading' }}

{{> components/gift-certificate/navigation gift_page='purchase'}} -
+ -
+ {{/partial}} {{> layout/base}} diff --git a/templates/pages/gift-certificate/redeem.html b/templates/pages/gift-certificate/redeem.html index 9f426c2bd4..9d8b7e7334 100644 --- a/templates/pages/gift-certificate/redeem.html +++ b/templates/pages/gift-certificate/redeem.html @@ -4,7 +4,7 @@

{{lang 'gift_certificate.heading' }}

{{> components/gift-certificate/navigation gift_page='redeem'}} -
+
+ {{/partial}} {{> layout/base}} diff --git a/templates/pages/page.html b/templates/pages/page.html index 9e65e24aaf..0572768dda 100644 --- a/templates/pages/page.html +++ b/templates/pages/page.html @@ -2,7 +2,7 @@ {{> components/common/breadcrumbs breadcrumbs=breadcrumbs}} -
+
{{#unless theme_settings.hide_page_heading }}

{{ page.title }}

{{/unless}} @@ -37,7 +37,7 @@
{{title}}
{{/each}} {{/if}} -
+ {{/partial}} diff --git a/templates/pages/search.html b/templates/pages/search.html index f4031a0d6b..2da23f14be 100644 --- a/templates/pages/search.html +++ b/templates/pages/search.html @@ -61,7 +61,7 @@ {{> components/faceted-search/index product_results}} {{/if}} -
+
{{#if forms.search.has_suggestions}}
@@ -142,7 +142,7 @@
{{lang 'forms.search.suggestions.title'}}
{{{region name="search_below_content"}}} -
+ {{/partial}}