diff --git a/falcon/_dev/css/theme/custom/_custom.scss b/falcon/_dev/css/theme/custom/_custom.scss index 614a919..a660a38 100644 --- a/falcon/_dev/css/theme/custom/_custom.scss +++ b/falcon/_dev/css/theme/custom/_custom.scss @@ -12,9 +12,10 @@ //@import "modules/"; //Layouts: Parts of a page, such as the header, footer, etc. -//@import "layout/header"; //@import "layout/footer"; +@import "layout/header"; @import "layout/left-column"; +@import "layout/swiper"; // Pages //@import "pages/category"; diff --git a/falcon/_dev/css/theme/custom/layout/_header.scss b/falcon/_dev/css/theme/custom/layout/_header.scss new file mode 100644 index 0000000..c5f328d --- /dev/null +++ b/falcon/_dev/css/theme/custom/layout/_header.scss @@ -0,0 +1,13 @@ +.header-top__row { + flex-wrap: wrap; + .header-top__block--search { + @include media-breakpoint-down(sm) { + order: 1; + } + .js-search-form { + max-width: unset; + width: 100%; + margin: 0; + } + } +} diff --git a/falcon/_dev/css/theme/custom/layout/_swiper.scss b/falcon/_dev/css/theme/custom/layout/_swiper.scss new file mode 100644 index 0000000..ecbc892 --- /dev/null +++ b/falcon/_dev/css/theme/custom/layout/_swiper.scss @@ -0,0 +1,3 @@ +.swiper-slide { + height: auto; +} diff --git a/falcon/_dev/img/x.svg b/falcon/_dev/img/x.svg index fdcc4e8..61979ba 100644 --- a/falcon/_dev/img/x.svg +++ b/falcon/_dev/img/x.svg @@ -1,3 +1,20 @@ - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + diff --git a/falcon/modules/is_favoriteproducts/views/templates/hook/top.tpl b/falcon/modules/is_favoriteproducts/views/templates/hook/top.tpl new file mode 100644 index 0000000..259802d --- /dev/null +++ b/falcon/modules/is_favoriteproducts/views/templates/hook/top.tpl @@ -0,0 +1,19 @@ +
+ +
+ {capture name="svg_output"}{svg_icon file='heart.svg'}{/capture} + {if $smarty.capture.svg_output} + {$smarty.capture.svg_output nofilter} + {else} + favorite + {/if} + + {$favoriteProductsCount} + +
+ +
diff --git a/falcon/modules/is_searchbar/views/templates/hook/is_searchbar.tpl b/falcon/modules/is_searchbar/views/templates/hook/is_searchbar.tpl new file mode 100644 index 0000000..4cda15b --- /dev/null +++ b/falcon/modules/is_searchbar/views/templates/hook/is_searchbar.tpl @@ -0,0 +1,17 @@ +
+
+
+
+ + + +
+
+
+
\ No newline at end of file diff --git a/falcon/modules/is_shoppingcart/views/templates/hook/is_shoppingcart.tpl b/falcon/modules/is_shoppingcart/views/templates/hook/is_shoppingcart.tpl new file mode 100644 index 0000000..c15d237 --- /dev/null +++ b/falcon/modules/is_shoppingcart/views/templates/hook/is_shoppingcart.tpl @@ -0,0 +1,89 @@ +{** + * 2007-2020 PrestaShop and Contributors + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.txt. + * 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 + * @copyright 2007-2020 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA + *} + +
+
+ + +
+ {capture name="svg_output"}{svg_icon file='bag.svg'}{/capture} + {if $smarty.capture.svg_output} + {$smarty.capture.svg_output nofilter} + {else} + shopping_basket + {/if} + + {$cart.products_count} + +
+ +
+
+
+ +
+
+

+ {l s='Your cart' d='Modules.Isshoppingcart.Isshoppingcart'} +

+ + close + +
+ {if $cart.products_count > 0} +
+ {foreach from=$cart.products item=product} + {include 'module:is_shoppingcart/views/templates/front/is_shoppingcart-product-line.tpl' product=$product} + {/foreach} +
+ +
+ {$cart.totals.total.label} + {$cart.totals.total.value} +
+ +
+ + {l s='Proceed to checkout' d='Shop.Theme.Actions'} + +
+ + {else} +
+ {l s='Unfortunately your basket is empty' d='Modules.Isshoppingcart.Isshoppingcart'} +
+ {/if} +
+
+
+
diff --git a/falcon/templates/_partials/footer-copyright.tpl b/falcon/templates/_partials/footer-copyright.tpl new file mode 100644 index 0000000..52a87f2 --- /dev/null +++ b/falcon/templates/_partials/footer-copyright.tpl @@ -0,0 +1,25 @@ +
+
+
+ + {l + s='Copyright © %year% %shop%' + sprintf=['%year%' => $smarty.now|date_format:"%Y", '%shop%' => $shop.name|capitalize] + d='Shop.Theme.Footer' + } + +
+ + {l s='PrestaShop' d='Shop.Theme.Footer'} + +
+ + {l s='Terms & Conditions' d='Shop.Theme.Footer'} + + | + + {l s='Privacy policy' d='Shop.Theme.Footer'} + +
+
+
\ No newline at end of file diff --git a/falcon/templates/_partials/footer.tpl b/falcon/templates/_partials/footer.tpl index 9a18ca0..a4086c3 100644 --- a/falcon/templates/_partials/footer.tpl +++ b/falcon/templates/_partials/footer.tpl @@ -29,7 +29,7 @@ {/block} -
+
{block name='hook_footer'} @@ -42,4 +42,5 @@ {/block}
+ {include file='_partials/footer-copyright.tpl'}
diff --git a/falcon/templates/_partials/header.tpl b/falcon/templates/_partials/header.tpl index b6e748f..96c2249 100644 --- a/falcon/templates/_partials/header.tpl +++ b/falcon/templates/_partials/header.tpl @@ -49,12 +49,17 @@ data-target="#mobile_top_menu_wrapper" >
- menu + {capture name="svg_output"}{svg_icon file='hamburger-menu.svg'}{/capture} + {if $smarty.capture.svg_output} + {$smarty.capture.svg_output nofilter} + {else} + menu + {/if}
-