From e5049a469f20e264faf0838ae82bcbe7e10ccb97 Mon Sep 17 00:00:00 2001 From: apurvab Date: Thu, 13 Jun 2024 14:34:39 +0530 Subject: [PATCH 1/7] 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 e6036c3d83f4db169dc0c28eb32f978a9fb0ca76 Mon Sep 17 00:00:00 2001 From: apurvabangali <107414864+apurvabangali@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:24:46 +0530 Subject: [PATCH 2/7] refactor: remove the code from layouts to add it in prestashop custom text block --- templates/layouts/layout-both-columns.tpl | 102 ---------------------- 1 file changed, 102 deletions(-) mode change 100755 => 100644 templates/layouts/layout-both-columns.tpl diff --git a/templates/layouts/layout-both-columns.tpl b/templates/layouts/layout-both-columns.tpl old mode 100755 new mode 100644 index 87b117e..a32d56c --- a/templates/layouts/layout-both-columns.tpl +++ b/templates/layouts/layout-both-columns.tpl @@ -84,108 +84,6 @@

{/block} - {if $page.page_name == 'index'} -
-

Custom design by you

-
- - - - - - - - -
-
- - -
-

Design and Visualize what you need

-

Choose what looks good on you

- -
- -
-
-

Business Suits for Men

-

Make a powerful impression and radiate confidence

- Tailored business Suits designed for you to make a - powerful impression and radiate confidence. -
-
-

Browse through our design

-

Get inspired with our curated outfit ideas

- -
-
-

Get the perfect fit

-

Get inspired with our curated outfit ideas

- The future of fashion with our innovative designs. Customization options tailored to your measurements and discover your perfect fit in minutes -
-
-
- -
-
-

Wear Your Identity

-

Fashion that speaks volumes

- -
-
-

Timeless Quality

-

Fashion that stands the test of time

- Invest in enduring fashion with our commitment to quality and - durability.From custom-made tuxedos to business suits, each piece stands the test of time. -
-
-

Tailored to your specifications

-

Tailor every detail to match your preferences

-
-
-
- - - - {l s='View More' d='Shop.Theme.Catalog'} - - - - -
-
-
-

“ - BrooksBingham is your destination for custom-tailored menswear, where authenticity is woven into every stitch.”

- -

Our perfect fit guarantee ensures that every piece you order is tailored to your exact specifications, delivering a perfect fit every time.

-
-
-
- - {/if} - {block name="right_column"}
{if $page.page_name == 'product'} From cd08e386288bc876e83185a93599a521529310a6 Mon Sep 17 00:00:00 2001 From: apurvabangali <107414864+apurvabangali@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:25:53 +0530 Subject: [PATCH 3/7] refactor: remove filter from custom made page and add a heading --- templates/catalog/_partials/products.tpl | 28 +++++++++++++++++++++ templates/catalog/_partials/sort-orders.tpl | 2 ++ 2 files changed, 30 insertions(+) diff --git a/templates/catalog/_partials/products.tpl b/templates/catalog/_partials/products.tpl index 8814449..f79bc9b 100644 --- a/templates/catalog/_partials/products.tpl +++ b/templates/catalog/_partials/products.tpl @@ -22,6 +22,32 @@ * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) * International Registered Trademark & Property of PrestaShop SA *} + + +{if $page.meta.title == 'Custom made' || $page.meta.title == 'custom made' || $page.meta.title == 'Custom Made' || $page.meta.title == 'custom'} +
+

+ Curate a Perfect Wardrobe with Our Custom-Made Apparel

+

+ Step into our world of custom-made luxury with Brooks Bingham, offering you Custom Business Shirts, + Custom Sport Jackets, Custom Made Tuxedos, and more.

+
+{/if} + +
{foreach from=$listing.products item="product"} @@ -31,9 +57,11 @@ {/foreach}
+{if $page.meta.title != 'Custom made' && $page.meta.title != 'custom made' && $page.meta.title != 'Custom Made' && $page.meta.title != 'custom'} {block name='pagination'} {include file='_partials/pagination.tpl' pagination=$listing.pagination} {/block} +{/if}
diff --git a/templates/catalog/_partials/sort-orders.tpl b/templates/catalog/_partials/sort-orders.tpl index c92aa7a..9a41d12 100644 --- a/templates/catalog/_partials/sort-orders.tpl +++ b/templates/catalog/_partials/sort-orders.tpl @@ -23,6 +23,7 @@ * International Registered Trademark & Property of PrestaShop SA *} + \ No newline at end of file From 074ec74bc84563ee5005c246d6122f662694177d Mon Sep 17 00:00:00 2001 From: apurvabangali <107414864+apurvabangali@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:26:15 +0530 Subject: [PATCH 4/7] fix: change the logo size --- templates/_partials/header.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/_partials/header.tpl b/templates/_partials/header.tpl index 4a23c77..1aabc7a 100644 --- a/templates/_partials/header.tpl +++ b/templates/_partials/header.tpl @@ -24,9 +24,9 @@ *} {block name='header_top'} -
+
-
+
{$shop.name} From 46df4db770e39dfb723756e5d7d6b0642e83ba17 Mon Sep 17 00:00:00 2001 From: apurvabangali <107414864+apurvabangali@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:27:02 +0530 Subject: [PATCH 5/7] refactor: add banner below featured products --- .../templates/hook/ps_featuredproducts.tpl | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/modules/ps_featuredproducts/views/templates/hook/ps_featuredproducts.tpl b/modules/ps_featuredproducts/views/templates/hook/ps_featuredproducts.tpl index 9d8076b..9f0b53f 100644 --- a/modules/ps_featuredproducts/views/templates/hook/ps_featuredproducts.tpl +++ b/modules/ps_featuredproducts/views/templates/hook/ps_featuredproducts.tpl @@ -31,13 +31,32 @@ {include file="catalog/_partials/miniatures/product.tpl" product=$product} {/foreach}
- + {l s='All products' d='Shop.Theme.Catalog'} +{if $page.page_name == "index"} +
+ +
+

Step into Style with a Custom Touch

+

+ Our perfect fit guarantee ensures that every plece you order is tailored to your exact specifications, + delivering a perfect fit every time. +

+
+ + Start Customization + +
+
+
- +{/if} From 38139c92ca6d49b56a259370c77f22b76e9d7b16 Mon Sep 17 00:00:00 2001 From: apurvabangali <107414864+apurvabangali@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:28:46 +0530 Subject: [PATCH 6/7] fix: delete the bodymeasurements override --- .../templates/hook/displayCustomerAccount.tpl | 25 ------------------- 1 file changed, 25 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 - - From 0b913e55c876d4b75c060b8c62372fcb6beee6cc Mon Sep 17 00:00:00 2001 From: apurvabangali <107414864+apurvabangali@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:29:29 +0530 Subject: [PATCH 7/7] chore: add theme.css file --- assets/css/custom.css | 3 + assets/css/theme.css | 236 ++++++++++++++++++++++++------------------ 2 files changed, 138 insertions(+), 101 deletions(-) create mode 100644 assets/css/custom.css mode change 100755 => 100644 assets/css/theme.css diff --git a/assets/css/custom.css b/assets/css/custom.css new file mode 100644 index 0000000..a5fa843 --- /dev/null +++ b/assets/css/custom.css @@ -0,0 +1,3 @@ +body{ + background-color:white; +} \ No newline at end of file diff --git a/assets/css/theme.css b/assets/css/theme.css old mode 100755 new mode 100644 index c36e19e..1b4cc88 --- a/assets/css/theme.css +++ b/assets/css/theme.css @@ -803,10 +803,6 @@ select { bottom: 0px; } -.bottom-1 { - bottom: 0.25rem; -} - .bottom-\[50\%\] { bottom: 50%; } @@ -827,14 +823,14 @@ select { right: 3rem; } -.right-2 { - right: 0.5rem; -} - .right-4 { right: 1rem; } +.right-8 { + right: 2rem; +} + .top-0 { top: 0px; } @@ -859,38 +855,6 @@ select { z-index: 10; } -.col-span-1 { - grid-column: span 1 / span 1; -} - -.col-start-1 { - grid-column-start: 1; -} - -.col-start-2 { - grid-column-start: 2; -} - -.row-span-1 { - grid-row: span 1 / span 1; -} - -.row-span-2 { - grid-row: span 2 / span 2; -} - -.row-span-3 { - grid-row: span 3 / span 3; -} - -.row-start-1 { - grid-row-start: 1; -} - -.row-end-2 { - grid-row-end: 2; -} - .-mx-2 { margin-left: -0.5rem; margin-right: -0.5rem; @@ -944,18 +908,10 @@ select { margin-bottom: 3rem; } -.mb-16 { - margin-bottom: 4rem; -} - .mb-2 { margin-bottom: 0.5rem; } -.mb-20 { - margin-bottom: 5rem; -} - .mb-24 { margin-bottom: 6rem; } @@ -1008,10 +964,6 @@ select { margin-top: 0.5rem; } -.mt-20 { - margin-top: 5rem; -} - .mt-24 { margin-top: 6rem; } @@ -1052,10 +1004,6 @@ select { display: flow-root; } -.grid { - display: grid; -} - .hidden { display: none; } @@ -1100,6 +1048,10 @@ select { height: 100%; } +.h-screen { + height: 100vh; +} + .max-h-\[40px\] { max-height: 40px; } @@ -1164,6 +1116,10 @@ select { width: 160px; } +.w-\[40\%\] { + width: 40%; +} + .w-full { width: 100%; } @@ -1173,6 +1129,10 @@ select { width: max-content; } +.w-16 { + width: 4rem; +} + .max-w-6xl { max-width: 72rem; } @@ -1236,10 +1196,6 @@ select { list-style-type: square; } -.grid-cols-2 { - grid-template-columns: repeat(2, minmax(0, 1fr)); -} - .flex-row { flex-direction: row; } @@ -1268,6 +1224,10 @@ select { align-items: baseline; } +.justify-start { + justify-content: flex-start; +} + .justify-end { justify-content: flex-end; } @@ -1312,15 +1272,6 @@ select { gap: 2rem; } -.gap-x-1 { - -moz-column-gap: 0.25rem; - column-gap: 0.25rem; -} - -.gap-y-1 { - row-gap: 0.25rem; -} - .space-x-2 > :not([hidden]) ~ :not([hidden]) { --tw-space-x-reverse: 0; margin-right: calc(0.5rem * var(--tw-space-x-reverse)); @@ -1349,6 +1300,10 @@ select { border-width: 1px; } +.border-2 { + border-width: 2px; +} + .border-t { border-top-width: 1px; } @@ -1412,6 +1367,11 @@ select { border-color: rgb(252 165 165 / var(--tw-border-opacity)); } +.border-white { + --tw-border-opacity: 1; + border-color: rgb(255 255 255 / var(--tw-border-opacity)); +} + .bg-black\/70 { background-color: rgb(0 0 0 / 0.7); } @@ -1451,6 +1411,14 @@ select { background-color: rgb(255 255 255 / var(--tw-bg-opacity)); } +.bg-cover { + background-size: cover; +} + +.bg-center { + background-position: center; +} + .stroke-black { stroke: #000; } @@ -1480,6 +1448,10 @@ select { object-fit: cover; } +.p-1 { + padding: 0.25rem; +} + .p-2 { padding: 0.5rem; } @@ -1506,6 +1478,11 @@ select { padding-right: 1rem; } +.px-5 { + padding-left: 1.25rem; + padding-right: 1.25rem; +} + .px-6 { padding-left: 1.5rem; padding-right: 1.5rem; @@ -1553,6 +1530,10 @@ select { padding-left: 0.5rem; } +.pl-4 { + padding-left: 1rem; +} + .pl-6 { padding-left: 1.5rem; } @@ -1561,14 +1542,6 @@ select { padding-right: 0px; } -.pr-1 { - padding-right: 0.25rem; -} - -.pr-1\.5 { - padding-right: 0.375rem; -} - .pr-2 { padding-right: 0.5rem; } @@ -1597,6 +1570,10 @@ select { padding-top: 1.5rem; } +.pt-8 { + padding-top: 2rem; +} + .text-left { text-align: left; } @@ -2095,6 +2072,10 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { position: absolute; } + .md\:mt-24 { + margin-top: 6rem; + } + .md\:block { display: block; } @@ -2107,6 +2088,10 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { display: none; } + .md\:h-\[300px\] { + height: 300px; + } + .md\:h-\[3rem\] { height: 3rem; } @@ -2131,14 +2116,14 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { width: 6rem; } - .md\:w-3\/5 { - width: 60%; - } - .md\:w-3\/6 { width: 50%; } + .md\:w-8\/12 { + width: 66.666667%; + } + .md\:flex-row { flex-direction: row; } @@ -2167,6 +2152,15 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { padding: 2rem; } + .md\:px-4 { + padding-left: 1rem; + padding-right: 1rem; + } + + .md\:pl-12 { + padding-left: 3rem; + } + .md\:pl-4 { padding-left: 1rem; } @@ -2183,14 +2177,13 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { padding-right: 12rem; } - .md\:text-3xl { - font-size: 1.875rem; - line-height: 2.25rem; + .md\:pt-6 { + padding-top: 1.5rem; } - .md\:text-4xl { - font-size: 2.25rem; - line-height: 2.5rem; + .md\:text-2xl { + font-size: 1.5rem; + line-height: 2rem; } .md\:text-base { @@ -2208,9 +2201,22 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { line-height: 1.25rem; } + .md\:text-3xl { + font-size: 1.875rem; + line-height: 2.25rem; + } + .md\:font-bold { font-weight: 700; } + + .md\:font-medium { + font-weight: 500; + } + + .md\:font-semibold { + font-weight: 600; + } } @media (min-width: 1024px) { @@ -2218,22 +2224,10 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { position: static; } - .lg\:bottom-3 { - bottom: 0.75rem; - } - .lg\:right-0 { right: 0px; } - .lg\:mb-2 { - margin-bottom: 0.5rem; - } - - .lg\:mb-32 { - margin-bottom: 8rem; - } - .lg\:flex { display: flex; } @@ -2242,6 +2236,10 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { display: none; } + .lg\:h-\[400px\] { + height: 400px; + } + .lg\:h-\[90vh\] { height: 90vh; } @@ -2266,6 +2264,10 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { width: 60%; } + .lg\:w-52 { + width: 13rem; + } + .lg\:w-full { width: 100%; } @@ -2298,8 +2300,9 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { background-color: transparent; } - .lg\:p-4 { - padding: 1rem; + .lg\:px-36 { + padding-left: 9rem; + padding-right: 9rem; } .lg\:py-0 { @@ -2307,15 +2310,42 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { padding-bottom: 0px; } + .lg\:pl-24 { + padding-left: 6rem; + } + .lg\:pt-24 { padding-top: 6rem; } + .lg\:pt-9 { + padding-top: 2.25rem; + } + + .lg\:text-2xl { + font-size: 1.5rem; + line-height: 2rem; + } + + .lg\:text-4xl { + font-size: 2.25rem; + line-height: 2.5rem; + } + + .lg\:text-5xl { + font-size: 3rem; + line-height: 1; + } + .lg\:text-xl { font-size: 1.25rem; line-height: 1.75rem; } + .lg\:font-semibold { + font-weight: 600; + } + .lg\:font-bold { font-weight: 700; } @@ -2331,5 +2361,9 @@ input[type="radio"]:focus,input[type="checkbox"]:focus { .xl\:w-1\/4 { width: 25%; } + + .xl\:w-9\/12 { + width: 75%; + } }