From e5049a469f20e264faf0838ae82bcbe7e10ccb97 Mon Sep 17 00:00:00 2001 From: apurvab Date: Thu, 13 Jun 2024 14:34:39 +0530 Subject: [PATCH 1/3] fix:Add space around who are we section --- assets/css/theme.css | 56 +++++++++++++------ .../_partials/order-final-summary-table.tpl | 0 .../_partials/order-final-summary.tpl | 0 templates/layouts/layout-both-columns.tpl | 2 +- 4 files changed, 41 insertions(+), 17 deletions(-) mode change 100755 => 100644 templates/checkout/_partials/order-final-summary-table.tpl mode change 100755 => 100644 templates/checkout/_partials/order-final-summary.tpl mode change 100644 => 100755 templates/layouts/layout-both-columns.tpl diff --git a/assets/css/theme.css b/assets/css/theme.css index 61c8d50..c36e19e 100755 --- a/assets/css/theme.css +++ b/assets/css/theme.css @@ -1,5 +1,5 @@ /* -! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com +! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com */ /* @@ -32,9 +32,11 @@ 4. Use the user's configured `sans` font-family by default. 5. Use the user's configured `sans` font-feature-settings by default. 6. Use the user's configured `sans` font-variation-settings by default. +7. Disable tap highlights on iOS */ -html { +html, +:host { line-height: 1.5; /* 1 */ -webkit-text-size-adjust: 100%; @@ -50,6 +52,8 @@ html { /* 5 */ font-variation-settings: normal; /* 6 */ + -webkit-tap-highlight-color: transparent; + /* 7 */ } /* @@ -121,8 +125,10 @@ strong { } /* -1. Use the user's configured `mono` font family by default. -2. Correct the odd `em` font sizing in all browsers. +1. Use the user's configured `mono` font-family by default. +2. Use the user's configured `mono` font-feature-settings by default. +3. Use the user's configured `mono` font-variation-settings by default. +4. Correct the odd `em` font sizing in all browsers. */ code, @@ -131,8 +137,12 @@ samp, pre { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; /* 1 */ - font-size: 1em; + font-feature-settings: normal; /* 2 */ + font-variation-settings: normal; + /* 3 */ + font-size: 1em; + /* 4 */ } /* @@ -201,6 +211,8 @@ textarea { /* 1 */ line-height: inherit; /* 1 */ + letter-spacing: inherit; + /* 1 */ color: inherit; /* 1 */ margin: 0; @@ -224,9 +236,9 @@ select { */ button, -[type='button'], -[type='reset'], -[type='submit'] { +input:where([type='button']), +input:where([type='reset']), +input:where([type='submit']) { -webkit-appearance: button; /* 1 */ background-color: transparent; @@ -653,6 +665,10 @@ select { --tw-backdrop-opacity: ; --tw-backdrop-saturate: ; --tw-backdrop-sepia: ; + --tw-contain-size: ; + --tw-contain-layout: ; + --tw-contain-paint: ; + --tw-contain-style: ; } ::backdrop { @@ -703,6 +719,10 @@ select { --tw-backdrop-opacity: ; --tw-backdrop-saturate: ; --tw-backdrop-sepia: ; + --tw-contain-size: ; + --tw-contain-layout: ; + --tw-contain-paint: ; + --tw-contain-style: ; } .container { @@ -932,6 +952,10 @@ select { margin-bottom: 0.5rem; } +.mb-20 { + margin-bottom: 5rem; +} + .mb-24 { margin-bottom: 6rem; } @@ -1008,10 +1032,6 @@ select { margin-top: 2rem; } -.mb-20 { - margin-bottom: 5rem; -} - .block { display: block; } @@ -1068,6 +1088,10 @@ select { height: 2rem; } +.h-\[50vh\] { + height: 50vh; +} + .h-auto { height: auto; } @@ -2202,14 +2226,14 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { right: 0px; } - .lg\:mb-32 { - margin-bottom: 8rem; - } - .lg\:mb-2 { margin-bottom: 0.5rem; } + .lg\:mb-32 { + margin-bottom: 8rem; + } + .lg\:flex { display: flex; } diff --git a/templates/checkout/_partials/order-final-summary-table.tpl b/templates/checkout/_partials/order-final-summary-table.tpl old mode 100755 new mode 100644 diff --git a/templates/checkout/_partials/order-final-summary.tpl b/templates/checkout/_partials/order-final-summary.tpl old mode 100755 new mode 100644 diff --git a/templates/layouts/layout-both-columns.tpl b/templates/layouts/layout-both-columns.tpl old mode 100644 new mode 100755 index 66671ae..87b117e --- a/templates/layouts/layout-both-columns.tpl +++ b/templates/layouts/layout-both-columns.tpl @@ -173,7 +173,7 @@ -
+

“ From b7919f182d0eb9a3525afcab44046520ce923c79 Mon Sep 17 00:00:00 2001 From: apurvabangali <107414864+apurvabangali@users.noreply.github.com> Date: Thu, 27 Jun 2024 18:14:55 +0530 Subject: [PATCH 2/3] fix: delete bodymeasurements override --- .../templates/hook/displayCustomerAccount.tpl | 25 ------------------- .../catalog/_partials/product-add-to-cart.tpl | 2 +- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 modules/bodymeasurements/views/templates/hook/displayCustomerAccount.tpl diff --git a/modules/bodymeasurements/views/templates/hook/displayCustomerAccount.tpl b/modules/bodymeasurements/views/templates/hook/displayCustomerAccount.tpl deleted file mode 100644 index a4a8a5d..0000000 --- a/modules/bodymeasurements/views/templates/hook/displayCustomerAccount.tpl +++ /dev/null @@ -1,25 +0,0 @@ -{** - * Copyright since 2007 PrestaShop SA and Contributors - * PrestaShop is an International Registered Trademark & Property of PrestaShop SA - * - * NOTICE OF LICENSE - * - * This source file is subject to the Academic Free License version 3.0 - * that is bundled with this package in the file LICENSE.md. - * It is also available through the world-wide-web at this URL: - * https://opensource.org/licenses/AFL-3.0 - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@prestashop.com so we can send you a copy immediately. - * - * @author PrestaShop SA and Contributors - * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 - *} - - - - - Body Measurements - - diff --git a/templates/catalog/_partials/product-add-to-cart.tpl b/templates/catalog/_partials/product-add-to-cart.tpl index 7a0a1e8..804a603 100644 --- a/templates/catalog/_partials/product-add-to-cart.tpl +++ b/templates/catalog/_partials/product-add-to-cart.tpl @@ -22,7 +22,7 @@ * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) * International Registered Trademark & Property of PrestaShop SA *} -

+
{if !$configuration.is_catalog} {block name='product_availability'} From d15bdaaa6fc501445de412cbc0360a5428c8f37f Mon Sep 17 00:00:00 2001 From: apurvabangali <107414864+apurvabangali@users.noreply.github.com> Date: Fri, 28 Jun 2024 13:58:30 +0530 Subject: [PATCH 3/3] fix: add slider in layouts --- assets/css/theme.css | 11 +++-------- templates/layouts/layout-both-columns.tpl | 10 ++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) mode change 100755 => 100644 assets/css/theme.css mode change 100755 => 100644 templates/layouts/layout-both-columns.tpl diff --git a/assets/css/theme.css b/assets/css/theme.css old mode 100755 new mode 100644 index c79689e..60d5e2f --- a/assets/css/theme.css +++ b/assets/css/theme.css @@ -1102,17 +1102,12 @@ select { height: 2rem; } -<<<<<<< HEAD -.h-\[50vh\] { - height: 50vh; -======= .h-\[350px\] { height: 350px; } .h-\[380px\] { height: 380px; ->>>>>>> upstream/staging } .h-auto { @@ -1921,7 +1916,7 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { } .group{ - &:before, + &:before, &:after { content: ""; display: table; @@ -2526,5 +2521,5 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { .xl\:w-9\/12 { width: 75%; } -} - +} + diff --git a/templates/layouts/layout-both-columns.tpl b/templates/layouts/layout-both-columns.tpl old mode 100755 new mode 100644 index 87b117e..f4e400d --- a/templates/layouts/layout-both-columns.tpl +++ b/templates/layouts/layout-both-columns.tpl @@ -54,6 +54,16 @@ {block name='displayBeforeWrapper'} {hook h='displayBeforeWrapper'} {/block} + + {if $page.page_name == 'index'} + +
+ +
+ + {/if}
{block name='breadcrumb'}