From a10e9edb143a0302f17506e668a9d90791f2b15d Mon Sep 17 00:00:00 2001 From: tblivet Date: Thu, 22 Jun 2023 14:05:29 +0200 Subject: [PATCH 01/28] feat: init typo file --- src/scss/core/components/_index.scss | 1 + src/scss/core/components/_typography.scss | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 src/scss/core/components/_typography.scss diff --git a/src/scss/core/components/_index.scss b/src/scss/core/components/_index.scss index 941efee7d..dc6249b28 100644 --- a/src/scss/core/components/_index.scss +++ b/src/scss/core/components/_index.scss @@ -15,3 +15,4 @@ @import "progress-ring"; @import "customization-modal"; @import "quickview-modal"; +@import "typography"; diff --git a/src/scss/core/components/_typography.scss b/src/scss/core/components/_typography.scss new file mode 100644 index 000000000..09fd38d61 --- /dev/null +++ b/src/scss/core/components/_typography.scss @@ -0,0 +1,21 @@ +// SCSS rules for typography + +// Titles +.first-title{ + @extend .h1; +} +.second-title{ + @extend .h2; +} +.third-title{ + @extend .h3; +} +.fourth-title{ + @extend .h4; +} +.fifth-title{ + @extend .h5; +} +.sixth-title{ + @extend .h6; +} \ No newline at end of file From a9721749ded2e1764bdd16a3d54d588495a01b7e Mon Sep 17 00:00:00 2001 From: tblivet Date: Thu, 22 Jun 2023 14:13:33 +0200 Subject: [PATCH 02/28] fix: hn blockwishlist --- .../views/templates/components/modals/add-to-wishlist.tpl | 2 +- .../blockwishlist/views/templates/components/modals/create.tpl | 2 +- .../blockwishlist/views/templates/components/modals/delete.tpl | 2 +- .../blockwishlist/views/templates/components/modals/login.tpl | 2 +- .../blockwishlist/views/templates/components/modals/rename.tpl | 2 +- .../blockwishlist/views/templates/components/modals/share.tpl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl b/modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl index 5af8d39b1..1c9f30e6b 100644 --- a/modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl +++ b/modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl @@ -19,7 +19,7 @@
-
{l s='Add to wishlist' d='Modules.Blockwishlist.Shop'}
+

{l s='Add to wishlist' d='Modules.Blockwishlist.Shop'}

@@ -97,7 +97,7 @@ {/if}
-

{$product.name}

+

{$product.name}

{block name='product_description_short'}
{$product.description_short nofilter}
{/block} From 54da90793756b552e4ae0624d3b51c218f7542bd Mon Sep 17 00:00:00 2001 From: tblivet Date: Thu, 22 Jun 2023 16:32:36 +0200 Subject: [PATCH 08/28] fix: hn section title component --- templates/components/section-title.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/components/section-title.tpl b/templates/components/section-title.tpl index f8cc80066..3ee8d3b78 100644 --- a/templates/components/section-title.tpl +++ b/templates/components/section-title.tpl @@ -5,5 +5,5 @@ {$componentName = 'section-title'} {block name='section_title'} -

{$title}

+

{$title}

{/block} From abcd069afd75823e76b3df02934c385180a02e21 Mon Sep 17 00:00:00 2001 From: tblivet Date: Thu, 22 Jun 2023 18:19:07 +0200 Subject: [PATCH 09/28] fix: hn ps_checkpayment --- .../ps_checkpayment/views/templates/hook/payment_return.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ps_checkpayment/views/templates/hook/payment_return.tpl b/modules/ps_checkpayment/views/templates/hook/payment_return.tpl index 7f66570ca..2305345da 100644 --- a/modules/ps_checkpayment/views/templates/hook/payment_return.tpl +++ b/modules/ps_checkpayment/views/templates/hook/payment_return.tpl @@ -5,8 +5,8 @@
-

{l s='Payment information' d='Shop.Theme.Checkout'}

-
{l s='Pay by Check' d='Modules.Checkpayment.Shop'}
+

{l s='Payment information' d='Shop.Theme.Checkout'}

+

{l s='Pay by Check' d='Modules.Checkpayment.Shop'}

{if $status === 'ok'}

{l s='You have chosen payment by check.' d='Modules.Checkpayment.Shop'}
From 2f0b67b152ecb2138efb2198ccb5e19c9a74c92c Mon Sep 17 00:00:00 2001 From: tblivet Date: Thu, 22 Jun 2023 18:29:27 +0200 Subject: [PATCH 10/28] fix: hn ps_contactinfo --- modules/ps_contactinfo/ps_contactinfo-rich.tpl | 2 +- src/scss/custom/modules/_contactinfo.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ps_contactinfo/ps_contactinfo-rich.tpl b/modules/ps_contactinfo/ps_contactinfo-rich.tpl index c5ef914e3..429523545 100644 --- a/modules/ps_contactinfo/ps_contactinfo-rich.tpl +++ b/modules/ps_contactinfo/ps_contactinfo-rich.tpl @@ -3,7 +3,7 @@ * file that was distributed with this source code. *}

-

{l s='Store information' d='Shop.Theme.Global'}

+

{l s='Store information' d='Shop.Theme.Global'}

{$contact_infos.address.formatted nofilter}
diff --git a/src/scss/custom/modules/_contactinfo.scss b/src/scss/custom/modules/_contactinfo.scss index 53a5a9cf6..fc599bb43 100644 --- a/src/scss/custom/modules/_contactinfo.scss +++ b/src/scss/custom/modules/_contactinfo.scss @@ -24,7 +24,7 @@ color: var(--bs-gray-600); } - h2 { + .contact__title { margin-bottom: 1.5rem; } } From 022e5e5a390fd1482b27416f4890b799b0f8cf6e Mon Sep 17 00:00:00 2001 From: tblivet Date: Thu, 22 Jun 2023 19:04:51 +0200 Subject: [PATCH 11/28] fix: hn ps_facetedsearch --- modules/ps_facetedsearch/ps_facetedsearch.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ps_facetedsearch/ps_facetedsearch.tpl b/modules/ps_facetedsearch/ps_facetedsearch.tpl index 2365524df..a18672376 100644 --- a/modules/ps_facetedsearch/ps_facetedsearch.tpl +++ b/modules/ps_facetedsearch/ps_facetedsearch.tpl @@ -12,7 +12,7 @@
-
{l s='Filter By' d='Shop.Theme.Actions'}
+

{l s='Filter By' d='Shop.Theme.Actions'}

From bb8ed7623a992e35121b05a853ad2634d38aff99 Mon Sep 17 00:00:00 2001 From: tblivet Date: Fri, 23 Jun 2023 10:23:21 +0200 Subject: [PATCH 12/28] fix: hn ps_legalcompliance --- .../views/templates/hook/hookDisplayFooter.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl b/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl index d9360e903..2a67ceadb 100644 --- a/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl +++ b/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl @@ -5,7 +5,7 @@
-

{l s='Information' d='Modules.Legalcompliance.Shop'}

+

{l s='Information' d='Modules.Legalcompliance.Shop'}