Add gap and font-size function classes

This branch was made to save edits that would make my life easier but are optional. These edits stray further form the original theme than the edits in the standard styles feature branch do, so if you are not used to them you night not like them. That is why I separated the branch.

falcon/_dev/css/abstracts/variables/bootstrap/_components.scss

@@ -1,12 +1,5 @@
 $border-width:                1px;
 $border-color:                $gray-300;
-$border-radius: 0.4rem;
+$border-radius:               .4rem;
-$border-radius-lg: 0.4rem;
+$border-radius-lg:            .4rem;
-$border-radius-sm: 0.4rem;
+$border-radius-sm:            .4rem;
-
-$card-border-color: $border-color;
-$table-border-color: $border-color;
-$input-border-color: $border-color;
-
-$input-focus-border-color: $border-color;
-$form-check-input-border: $border-color;

falcon/_dev/css/abstracts/variables/bootstrap/_forms.scss

@@ -6,5 +6,3 @@ $input-btn-padding-x-sm: rem-calc(8px);
 
 $input-btn-padding-y-lg:      rem-calc(14px);
 $input-btn-padding-x-lg:      rem-calc(20px);
-
-$input-height: rem-calc(50px);

falcon/_dev/css/abstracts/variables/bootstrap/_typography.scss

@@ -1,9 +1,10 @@
-$font-family-sans-serif: "Plus Jakarta Sans", sans-serif;
+$font-family-sans-serif: "Roboto", -apple-system, blinkmacsystemfont, "Segoe UI",
+    roboto, "Helvetica Neue", arial, "Noto Sans", "Liberation Sans", sans-serif,
+    "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 $font-family-base: $font-family-sans-serif;
 $headings-font-family: $font-family-sans-serif;
-$font-weight-base: 400;
 
-$font-size-base: rem-calc(14px);
+$font-size-base: rem-calc(16px);
 $font-size-lg: $font-size-base * 1.125;
 $font-size-sm: $font-size-base * 0.875;
 $font-size-xs: $font-size-base * 0.6875;

falcon/_dev/css/theme/_index.scss

@@ -5,4 +5,3 @@
 @import "layout/index";
 @import "components/index";
 
-@import "custom/custom";

falcon/_dev/css/theme/custom/_custom.scss

@@ -1,24 +1,18 @@
-/* 
+// NOTE: All bootstrap overrides have been configured under themes/falcon/_dev/css/abstracts/variables/bootstrap
-This is the main custom SCSS file for the Falcon theme. 
-
-I am loosely following the 7 in 1 structure for better organization of the styles. Learn more here:
-https://medium.com/@diyorbekjuraev77/be-a-master-at-creating-the-7-1-sass-pattern-776fdfb5a3b1
-
-⚠️NOTE: All bootstrap overrides have been configured under themes/falcon/_dev/css/abstracts/variables/bootstrap
-Look up all available Bootstrap variables here: https://rstudio.github.io/bslib/articles/bs5-variables/index.html
-
-*/
 
 //Abstracts: Things used throughout the site such as utility classes and generic overrides.
 //@import "abstracts/base";
 @import "abstracts/functions";
 @import "abstracts/mixins";
-@import "abstracts/utilities";
+//@import "abstracts/utilities";
 
 // Components: parts of the theme itself that are not associated with a module.
-@import "components/buttons";
+//@import "components/";
 @import "components/forms";
 
+// Modules: Styling for specific modules.
+//@import "modules/";
+
 //Layouts: Parts of a page, such as the header, footer, etc.
 //@import "layout/footer";
 @import "layout/header";
@@ -26,7 +20,5 @@ Look up all available Bootstrap variables here: https://rstudio.github.io/bslib/
 @import "layout/swiper";
 
 // Pages
-//@import "pages/checkout";
+//@import "pages/category";
-//@import "pages/home";
-//@import "pages/listing";
 //@import "pages/product";

falcon/_dev/css/theme/custom/abstracts/_functions.scss

@@ -8,34 +8,10 @@
     }
 }
 
-// Font weight utility classes generator
-// Generates utility classes like .fw-100, .fw-200, etc.
-@for $i from 100 through 900 {
-    @if $i % 100 == 0 {
-        .fw-#{$i} {
-            font-weight: #{$i} !important;
-        }
-    }
-}
-
 // gap size utility classes generator
-// Generates utility classes like .gap-4, .gap-col-4, .gap-row-4
+// Generates utility classes like .gap-4
 @for $i from 1 through 35 {
     .gap-#{$i} {
         gap: rem-calc($i * 1px) !important;
     }
-    .gap-col-#{$i} {
-        column-gap: rem-calc($i * 1px) !important;
-    }
-    .gap-row-#{$i} {
-        row-gap: rem-calc($i * 1px) !important;
-    }
-}
-
-// hex to rgba function
-@function hex-to-rgba($hex, $alpha) {
-    $r: red($hex);
-    $g: green($hex);
-    $b: blue($hex);
-    @return rgba($r, $g, $b, $alpha);
 }

falcon/_dev/css/theme/custom/abstracts/_mixins.scss

@@ -42,32 +42,3 @@
         @content;
     }
 }
-
-// Mixin to add an after pseudo-element with a mask image to customize button colors
-/* Example: 
-
-.btn-arrow-right{
-    &::after {
-        @include btn-after("../img/arrow-right.svg");
-    }
-}
-    
-*/
-
-@mixin btn-after($url, $color: currentColor) {
-    content: "";
-    display: inline-block;
-    width: 1em;
-    height: 1em;
-    margin-left: 0.5em;
-    vertical-align: middle;
-    background-color: currentColor;
-    mask-image: url(#{$url});
-    mask-size: contain;
-    mask-repeat: no-repeat;
-    mask-position: center;
-    -webkit-mask-image: url(#{$url});
-    -webkit-mask-size: contain;
-    -webkit-mask-repeat: no-repeat;
-    -webkit-mask-position: center;
-}

falcon/_dev/css/theme/custom/abstracts/_utilities.scss

@@ -1,43 +0,0 @@
-// Header selector for interpolation
-// Example usage: #{$headers} { ... }
-$headers: "h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6";
-
-// All text selector for interpolation
-$text: "#{$headers}, p, span, a, li";
-
-// Section Spacers. Just set the two variables below and it is fully responsive!
-// $section-spacer-small applies on breakpoints lg and below, OR always if specified in the class with  --small (ex. section-spacer--small).
-
-$section-spacer: rem-calc(50px);
-$section-spacer-small: rem-calc(25px);
-
-.section-spacer-both {
-    margin-top: $section-spacer-small;
-    margin-bottom: $section-spacer-small;
-    @include bs5-media-breakpoint-up(lg) {
-        margin-top: $section-spacer;
-        margin-bottom: $section-spacer;
-    }
-    &--small {
-        margin-top: $section-spacer-small;
-        margin-bottom: $section-spacer-small;
-        @include bs5-media-breakpoint-up(lg) {
-            margin-top: $section-spacer-small;
-            margin-bottom: $section-spacer-small;
-        }
-    }
-}
-.section-spacer {
-    @extend .section-spacer-both;
-    margin-bottom: unset;
-    &--small {
-        margin-bottom: unset;
-    }
-}
-.section-spacer-bottom {
-    @extend .section-spacer-both;
-    margin-top: unset;
-    &--small {
-        margin-top: unset;
-    }
-}

falcon/_dev/css/theme/custom/components/_buttons.scss

@@ -1,57 +0,0 @@
-// To customize text colors per button, use this map and below function
-
-$btn-color: (
-    "primary": $white,
-    "secondary": $white,
-    "light": $primary,
-    "dark": $white,
-);
-
-@each $name, $color in $btn-color {
-    .btn-#{$name},
-    .btn-lg-#{$name},
-    .btn-sm-#{$name} {
-        color: $color !important;
-    }
-}
-
-// Configure btn-outline text color on hover per button. (Same thing as above but for btn-outline and only on hover)
-$btn-outline-hover: (
-    "primary": $white,
-    "secondary": $white,
-);
-
-@each $name, $bg in $btn-outline-hover {
-    $text-color: if(
-        map-has-key($btn-color, $name),
-        map-get($btn-color, $name),
-        $white
-    );
-
-    .btn-outline-#{$name}:hover,
-    .btn-outline-#{$name}:focus,
-    .btn-outline-#{$name}:active,
-    .btn-outline-#{$name}.active,
-    .show > .btn-outline-#{$name}.dropdown-toggle {
-        color: $text-color !important;
-    }
-}
-
-// Bootstrap touchspin
-.bootstrap-touchspin {
-    flex-wrap: nowrap;
-
-    .input-touchspin {
-        height: rem-calc(50px);
-        min-width: rem-calc(75px);
-        border-left: 0px;
-    }
-
-    .input-group-btn-vertical {
-        display: flex;
-        flex-direction: column;
-        button {
-            border-radius: 0px;
-        }
-    }
-}

falcon/_dev/css/theme/custom/components/_forms.scss

@@ -1,10 +1,12 @@
-.input-group.js-parent-focus {
+.field-password-policy .input-group.js-parent-focus {
+    > * {
+        max-height: rem-calc(39px);
+    }
+    .form-control {
+        height: unset;
+    }
     .input-group-append .btn {
         border-top-right-radius: $border-radius !important;
         border-bottom-right-radius: $border-radius !important;
     }
 }
-
-.input-group.js-parent-focus {
-    height: $input-height;
-}

falcon/_dev/css/theme/custom/layout/_header.scss

@@ -10,8 +10,4 @@
             margin: 0;
         }
     }
-
-    .header-top__badge {
-        right: -0.9em;
-    }
 }

falcon/_dev/img/checkmark.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check2" viewBox="0 0 16 16">
-  <path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0"/>
-</svg>

falcon/_dev/js/theme/components/cart/cart.js

@@ -1,6 +1,6 @@
-import $ from "jquery";
+import $ from 'jquery';
-import prestashop from "prestashop";
+import prestashop from 'prestashop';
-import debounce from "@js/theme/utils/debounce";
+import debounce from '@js/theme/utils/debounce';
 
 prestashop.cart = prestashop.cart || {};
 
@@ -9,7 +9,7 @@ prestashop.cart.active_inputs = null;
 const spinnerSelector = 'input[name="product-quantity-spin"]';
 let hasError = false;
 let isUpdateOperation = false;
-let errorMsg = "";
+let errorMsg = '';
 
 const CheckUpdateQuantityOperations = {
   switchErrorStat: () => {
@@ -19,14 +19,11 @@ const CheckUpdateQuantityOperations = {
      */
     const $checkoutBtn = $(prestashop.themeSelectors.checkout.btn);
 
-        if (
+    if ($(prestashop.themeSelectors.notifications.dangerAlert).length || (errorMsg !== '' && !hasError)) {
-            $(prestashop.themeSelectors.notifications.dangerAlert).length ||
+      $checkoutBtn.addClass('disabled');
-            (errorMsg !== "" && !hasError)
-        ) {
-            $checkoutBtn.addClass("disabled");
     }
 
-        if (errorMsg !== "") {
+    if (errorMsg !== '') {
       const strError = `
         <article class="alert alert-danger" role="alert" data-alert="danger">
           <ul class="mb-0">
@@ -35,17 +32,17 @@ const CheckUpdateQuantityOperations = {
         </article>
       `;
       $(prestashop.themeSelectors.notifications.container).html(strError);
-            errorMsg = "";
+      errorMsg = '';
       isUpdateOperation = false;
       if (hasError) {
         // if hasError is true, quantity was not updated : allow checkout
-                $checkoutBtn.removeClass("disabled");
+        $checkoutBtn.removeClass('disabled');
       }
     } else if (!hasError && isUpdateOperation) {
       hasError = false;
       isUpdateOperation = false;
-            $(prestashop.themeSelectors.notifications.container).html("");
+      $(prestashop.themeSelectors.notifications.container).html('');
-            $checkoutBtn.removeClass("disabled");
+      $checkoutBtn.removeClass('disabled');
     }
   },
   checkUpdateOperation: (resp) => {
@@ -55,11 +52,11 @@ const CheckUpdateQuantityOperations = {
      */
     const { hasError: hasErrorOccurred, errors: errorData } = resp;
     hasError = hasErrorOccurred ?? false;
-        const errors = errorData ?? "";
+    const errors = errorData ?? '';
 
     // 1.7.2.x returns errors as string, 1.7.3.x returns array
     if (errors instanceof Array) {
-            errorMsg = errors.join(" ");
+      errorMsg = errors.join(' ');
     } else {
       errorMsg = errors;
     }
@@ -74,18 +71,12 @@ const CheckUpdateQuantityOperations = {
 function createSpin() {
   $.each($(spinnerSelector), (index, spinner) => {
     $(spinner).TouchSpin({
-            verticalupclass: "",
+      verticalupclass: 'material-icons touchspin-up',
-            verticaldownclass: "",
+      verticaldownclass: 'material-icons touchspin-down',
-            buttondown_class:
+      buttondown_class: 'btn btn-touchspin js-touchspin js-increase-product-quantity',
-                "btn btn-primary btn-touchspin js-touchspin js-increase-product-quantity",
+      buttonup_class: 'btn btn-touchspin js-touchspin js-decrease-product-quantity',
-            buttonup_class:
+      min: parseInt($(spinner).attr('min'), 10),
-                "btn btn-primary btn-touchspin js-touchspin js-decrease-product-quantity",
-            min: parseInt($(spinner).attr("min"), 10),
       max: 1000000,
-            verticalup:
-                '<img src="/themes/falcon/_dev/img/chevron_up.svg" alt="Up" />',
-            verticaldown:
-                '<img src="/themes/falcon/_dev/img/chevron_down.svg" alt="Down" />',
     });
   });
 
@@ -103,49 +94,41 @@ const preventCustomModalOpen = (event) => {
 };
 
 $(() => {
-    const productLineInCartSelector =
+  const productLineInCartSelector = prestashop.themeSelectors.cart.productLineQty;
-        prestashop.themeSelectors.cart.productLineQty;
   const promises = [];
 
-    prestashop.on("updateCart", () => {
+  prestashop.on('updateCart', () => {
-        $(prestashop.themeSelectors.cart.quickview).modal("hide");
+    $(prestashop.themeSelectors.cart.quickview).modal('hide');
-        $("body").addClass("cart-loading");
+    $('body').addClass('cart-loading');
   });
 
-    prestashop.on("updatedCart", () => {
+  prestashop.on('updatedCart', () => {
     window.shouldPreventModal = false;
 
-        $(prestashop.themeSelectors.product.customizationModal).on(
+    $(prestashop.themeSelectors.product.customizationModal).on('show.bs.modal', (modalEvent) => {
-            "show.bs.modal",
-            (modalEvent) => {
       preventCustomModalOpen(modalEvent);
-            },
+    });
-        );
 
     createSpin();
-        $("body").removeClass("cart-loading");
+    $('body').removeClass('cart-loading');
   });
 
   createSpin();
 
-    const $body = $("body");
+  const $body = $('body');
 
   function isTouchSpin(namespace) {
-        return (
+    return namespace === 'on.startupspin' || namespace === 'on.startdownspin';
-            namespace === "on.startupspin" || namespace === "on.startdownspin"
-        );
   }
 
   function shouldIncreaseProductQuantity(namespace) {
-        return namespace === "on.startupspin";
+    return namespace === 'on.startupspin';
   }
 
   function findCartLineProductQuantityInput($target) {
-        const $input = $target
+    const $input = $target.parents(prestashop.themeSelectors.cart.touchspin).find(productLineInCartSelector);
-            .parents(prestashop.themeSelectors.cart.touchspin)
-            .find(productLineInCartSelector);
 
-        if ($input.is(":focus")) {
+    if ($input.is(':focus')) {
       return null;
     }
 
@@ -153,10 +136,10 @@ $(() => {
   }
 
   function camelize(subject) {
-        const actionTypeParts = subject.split("-");
+    const actionTypeParts = subject.split('-');
     let i;
     let part;
-        let camelizedSubject = "";
+    let camelizedSubject = '';
 
     for (i = 0; i < actionTypeParts.length; i += 1) {
       part = actionTypeParts[i];
@@ -174,8 +157,8 @@ $(() => {
   function parseCartAction($target, namespace) {
     if (!isTouchSpin(namespace)) {
       return {
-                url: $target.attr("href"),
+        url: $target.attr('href'),
-                type: camelize($target.data("link-action")),
+        type: camelize($target.data('link-action')),
       };
     }
 
@@ -186,13 +169,13 @@ $(() => {
     if ($input) {
       if (shouldIncreaseProductQuantity(namespace)) {
         cartAction = {
-                    url: $input.data("up-url"),
+          url: $input.data('up-url'),
-                    type: "increaseProductQuantity",
+          type: 'increaseProductQuantity',
         };
       } else {
         cartAction = {
-                    url: $input.data("down-url"),
+          url: $input.data('down-url'),
-                    type: "decreaseProductQuantity",
+          type: 'decreaseProductQuantity',
         };
       }
     }
@@ -208,19 +191,11 @@ $(() => {
     }
   };
 
-    const getTouchSpinInput = ($button) =>
+  const getTouchSpinInput = ($button) => $($button.parents(prestashop.themeSelectors.cart.touchspin).find('input'));
-        $(
-            $button
-                .parents(prestashop.themeSelectors.cart.touchspin)
-                .find("input"),
-        );
 
-    $(prestashop.themeSelectors.product.customizationModal).on(
+  $(prestashop.themeSelectors.product.customizationModal).on('show.bs.modal', (modalEvent) => {
-        "show.bs.modal",
-        (modalEvent) => {
     preventCustomModalOpen(modalEvent);
-        },
+  });
-    );
 
   const handleCartAction = (event) => {
     event.preventDefault();
@@ -231,19 +206,19 @@ $(() => {
 
     const cartAction = parseCartAction($target, event.namespace);
     const requestData = {
-            ajax: "1",
+      ajax: '1',
-            action: "update",
+      action: 'update',
     };
 
-        if (typeof cartAction === "undefined") {
+    if (typeof cartAction === 'undefined') {
       return;
     }
 
     $.ajax({
       url: cartAction.url,
-            method: "POST",
+      method: 'POST',
       data: requestData,
-            dataType: "json",
+      dataType: 'json',
       beforeSend: (jqXHR) => {
         promises.push(jqXHR);
       },
@@ -254,35 +229,31 @@ $(() => {
         $quantityInput.val(resp.quantity);
 
         // Refresh cart preview
-                prestashop.emit("updateCart", {
+        prestashop.emit('updateCart', {
           reason: dataset,
           resp,
         });
       })
       .fail((resp) => {
-                prestashop.emit("handleError", {
+        prestashop.emit('handleError', {
-                    eventType: "updateProductInCart",
+          eventType: 'updateProductInCart',
           resp,
           cartAction: cartAction.type,
         });
       });
   };
 
-    $body.on("click", prestashop.themeSelectors.cart.actions, handleCartAction);
+  $body.on('click', prestashop.themeSelectors.cart.actions, handleCartAction);
 
-    function sendUpdateQuantityInCartRequest(
+  function sendUpdateQuantityInCartRequest(updateQuantityInCartUrl, requestData, $target) {
-        updateQuantityInCartUrl,
-        requestData,
-        $target,
-    ) {
     abortPreviousRequests();
     window.shouldPreventModal = true;
 
     return $.ajax({
       url: updateQuantityInCartUrl,
-            method: "POST",
+      method: 'POST',
       data: requestData,
-            dataType: "json",
+      dataType: 'json',
       beforeSend: (jqXHR) => {
         promises.push(jqXHR);
       },
@@ -291,50 +262,45 @@ $(() => {
         CheckUpdateQuantityOperations.checkUpdateOperation(resp);
 
         $target.val(resp.quantity);
-                const dataset =
+        const dataset = ($target && $target.dataset) ? $target.dataset : resp;
-                    $target && $target.dataset ? $target.dataset : resp;
 
         // Refresh cart preview
-                prestashop.emit("updateCart", {
+        prestashop.emit('updateCart', {
           reason: dataset,
           resp,
         });
       })
       .fail((resp) => {
-                prestashop.emit("handleError", {
+        prestashop.emit('handleError', {
-                    eventType: "updateProductQuantityInCart",
+          eventType: 'updateProductQuantityInCart',
           resp,
         });
       });
   }
 
   function getQuantityChangeType($quantity) {
-        return $quantity > 0 ? "up" : "down";
+    return $quantity > 0 ? 'up' : 'down';
   }
 
   function getRequestData(quantity) {
     return {
-            ajax: "1",
+      ajax: '1',
       qty: Math.abs(quantity),
-            action: "update",
+      action: 'update',
       op: getQuantityChangeType(quantity),
     };
   }
 
   function updateProductQuantityInCart(event) {
     const $target = $(event.currentTarget);
-        const updateQuantityInCartUrl = $target.data("update-url");
+    const updateQuantityInCartUrl = $target.data('update-url');
-        const baseValue = $target.attr("value");
+    const baseValue = $target.attr('value');
 
     // There should be a valid product quantity in cart
     const targetValue = $target.val();
 
     /* eslint-disable */
-        if (
+    if (targetValue != parseInt(targetValue, 10) || targetValue < 0 || Number.isNaN(targetValue)) {
-            targetValue != parseInt(targetValue, 10) ||
-            targetValue < 0 ||
-            Number.isNaN(targetValue)
-        ) {
       window.shouldPreventModal = false;
       $target.val(baseValue);
       return;
@@ -348,29 +314,21 @@ $(() => {
       return;
     }
 
-        if (targetValue === "0") {
+    if (targetValue === '0') {
-            $target
+      $target.closest('.product-line-actions').find('[data-link-action="delete-from-cart"]').click();
-                .closest(".product-line-actions")
-                .find('[data-link-action="delete-from-cart"]')
-                .click();
     } else {
-            $target.attr("value", targetValue);
+      $target.attr('value', targetValue);
-            sendUpdateQuantityInCartRequest(
+      sendUpdateQuantityInCartRequest(updateQuantityInCartUrl, getRequestData(qty), $target);
-                updateQuantityInCartUrl,
-                getRequestData(qty),
-                $target,
-            );
     }
   }
 
+  $body.on('touchspin.on.stopspin', spinnerSelector, debounce(updateProductQuantityInCart));
+
   $body.on(
-        "touchspin.on.stopspin",
+    'focusout keyup',
-        spinnerSelector,
+    productLineInCartSelector,
-        debounce(updateProductQuantityInCart),
+    (event) => {
-    );
+      if (event.type === 'keyup') {
-
-    $body.on("focusout keyup", productLineInCartSelector, (event) => {
-        if (event.type === "keyup") {
         if (event.keyCode === 13) {
           isUpdateOperation = true;
           updateProductQuantityInCart(event);
@@ -384,20 +342,25 @@ $(() => {
       }
 
       return false;
-    });
+    },
+  );
 
-    $body.on("click", prestashop.themeSelectors.cart.discountCode, (event) => {
+  $body.on(
+    'click',
+    prestashop.themeSelectors.cart.discountCode,
+    (event) => {
       event.stopPropagation();
       event.preventDefault();
 
       const $code = $(event.currentTarget);
-        const $discountInput = $("[name=discount_name]");
+      const $discountInput = $('[name=discount_name]');
-        const $discountForm = $discountInput.closest("form");
+      const $discountForm = $discountInput.closest('form');
 
       $discountInput.val($code.text());
       // Show promo code field
-        $discountForm.trigger("submit");
+      $discountForm.trigger('submit');
 
       return false;
-    });
+    },
+  );
 });

falcon/_dev/js/theme/components/selectors.js

@@ -1,84 +1,82 @@
-import prestashop from "prestashop";
+import prestashop from 'prestashop';
-import $ from "jquery";
+import $ from 'jquery';
 
 prestashop.themeSelectors = {
   product: {
-        tabs: ".tabs .nav-link",
+    tabs: '.tabs .nav-link',
-        activeNavClass: "js-product-nav-active",
+    activeNavClass: 'js-product-nav-active',
-        activeTabClass: "js-product-tab-active",
+    activeTabClass: 'js-product-tab-active',
-        activeTabs: ".tabs .nav-link.active, .js-product-nav-active",
+    activeTabs: '.tabs .nav-link.active, .js-product-nav-active',
-        imagesModal: ".js-product-images-modal",
+    imagesModal: '.js-product-images-modal',
-        thumb: ".js-thumb",
+    thumb: '.js-thumb',
-        thumbContainer: ".thumb-container, .js-thumb-container",
+    thumbContainer: '.thumb-container, .js-thumb-container',
-        arrows: ".js-arrows",
+    arrows: '.js-arrows',
-        selected: ".selected, .js-thumb-selected",
+    selected: '.selected, .js-thumb-selected',
-        modalProductCover: ".js-modal-product-cover",
+    modalProductCover: '.js-modal-product-cover',
-        cover: ".js-qv-product-cover",
+    cover: '.js-qv-product-cover',
-        customizationModal: ".js-customization-modal",
+    customizationModal: '.js-customization-modal',
   },
   listing: {
-        searchFilterToggler: "#search_filter_toggler, .js-search-toggler",
+    searchFilterToggler: '#search_filter_toggler, .js-search-toggler',
-        searchFiltersWrapper: "#search_filters_wrapper",
+    searchFiltersWrapper: '#search_filters_wrapper',
-        searchFilterControls: "#search_filter_controls",
+    searchFilterControls: '#search_filter_controls',
-        searchFilters: "#search_filters",
+    searchFilters: '#search_filters',
-        activeSearchFilters: "#js-active-search-filters",
+    activeSearchFilters: '#js-active-search-filters',
-        listTop: "#js-product-list-top",
+    listTop: '#js-product-list-top',
-        list: "#js-product-list",
+    list: '#js-product-list',
-        listBottom: "#js-product-list-bottom",
+    listBottom: '#js-product-list-bottom',
-        listHeader: "#js-product-list-header",
+    listHeader: '#js-product-list-header',
-        searchFiltersClearAll: ".js-search-filters-clear-all",
+    searchFiltersClearAll: '.js-search-filters-clear-all',
-        searchLink: ".js-search-link",
+    searchLink: '.js-search-link',
   },
   order: {
-        returnForm: "#order-return-form, .js-order-return-form",
+    returnForm: '#order-return-form, .js-order-return-form',
   },
-    arrowDown: ".arrow-down, .js-arrow-down",
+  arrowDown: '.arrow-down, .js-arrow-down',
-    arrowUp: ".arrow-up, .js-arrow-up",
+  arrowUp: '.arrow-up, .js-arrow-up',
-    clear: ".clear",
+  clear: '.clear',
-    fileInput: ".js-file-input",
+  fileInput: '.js-file-input',
-    contentWrapper: "#content-wrapper, .js-content-wrapper",
+  contentWrapper: '#content-wrapper, .js-content-wrapper',
-    footer: "#footer, .js-footer",
+  footer: '#footer, .js-footer',
-    modalContent: ".js-modal-content",
+  modalContent: '.js-modal-content',
-    modal: ".js-checkout-modal",
+  modal: '.js-checkout-modal',
-    touchspin: ".js-touchspin",
+  touchspin: '.js-touchspin',
   checkout: {
-        termsLink: ".js-terms a",
+    termsLink: '.js-terms a',
-        giftCheckbox: ".js-gift-checkbox",
+    giftCheckbox: '.js-gift-checkbox',
-        imagesLink: ".card-block .cart-summary-products p a, .js-show-details",
+    imagesLink: '.card-block .cart-summary-products p a, .js-show-details',
-        carrierExtraContent:
+    carrierExtraContent: '.carrier-extra-content, .js-carrier-extra-content',
-            ".carrier-extra-content, .js-carrier-extra-content",
+    btn: '.checkout a',
-        btn: ".checkout a",
   },
   cart: {
-        productLineQty: ".js-cart-line-product-quantity",
+    productLineQty: '.js-cart-line-product-quantity',
-        quickview: ".quickview",
+    quickview: '.quickview',
-        touchspin: ".bootstrap-touchspin",
+    touchspin: '.bootstrap-touchspin',
-        promoCode: "#promo-code",
+    promoCode: '#promo-code',
-        displayPromo: ".display-promo",
+    displayPromo: '.display-promo',
-        promoCodeButton: ".promo-code-button",
+    promoCodeButton: '.promo-code-button',
-        discountCode: ".js-discount .js-code",
+    discountCode: '.js-discount .code',
-        discountName: "[name=discount_name]",
+    discountName: '[name=discount_name]',
-        actions:
+    actions: '[data-link-action="delete-from-cart"], [data-link-action="remove-voucher"]',
-            '[data-link-action="delete-from-cart"], [data-link-action="remove-voucher"]',
   },
   notifications: {
-        dangerAlert: "#notifications article.alert-danger",
+    dangerAlert: '#notifications article.alert-danger',
-        container: "#notifications .container",
+    container: '#notifications .container',
   },
   passwordPolicy: {
-        template: "#password-feedback",
+    template: '#password-feedback',
-        hint: ".js-hint-password",
+    hint: '.js-hint-password',
-        container: ".js-password-strength-feedback",
+    container: '.js-password-strength-feedback',
-        strengthText: ".js-password-strength-text",
+    strengthText: '.js-password-strength-text',
-        requirementScore: ".js-password-requirements-score",
+    requirementScore: '.js-password-requirements-score',
-        requirementLength: ".js-password-requirements-length",
+    requirementLength: '.js-password-requirements-length',
-        requirementScoreIcon: ".js-password-requirements-score i",
+    requirementScoreIcon: '.js-password-requirements-score i',
-        requirementLengthIcon: ".js-password-requirements-length i",
+    requirementLengthIcon: '.js-password-requirements-length i',
-        progressBar: ".js-password-policy-progress-bar",
+    progressBar: '.js-password-policy-progress-bar',
-        inputColumn: ".js-input-column",
+    inputColumn: '.js-input-column',
   },
 };
 
 $(() => {
-    prestashop.emit("themeSelectorsInit");
+  prestashop.emit('themeSelectorsInit');
 });

falcon/_dev/js/theme/index.js

@@ -66,22 +66,6 @@ function initStickyHeader() {
     }
 }
 
-// Sync product thumbs height with main images height
-function syncThumbsHeight() {
-    const mainImages = document.querySelector(".product-main-images");
-    const thumbs = document.querySelector(".product-thumbs.swiper");
-    // Only apply if Swiper is vertical
-    if (mainImages && thumbs && thumbs.classList.contains("swiper-vertical")) {
-        thumbs.style.maxHeight = mainImages.offsetHeight + "px";
-        thumbs.style.height = mainImages.offsetHeight + "px";
-    } else {
-        return;
-    }
-}
-
-window.addEventListener("load", syncThumbsHeight);
-window.addEventListener("resize", syncThumbsHeight);
-
 $(() => {
     initStickyHeader();
     accLinksTriggerActive();
@@ -95,19 +79,4 @@ $(() => {
     $(".js-select-link").on("change", ({ target }) => {
         window.location.href = $(target).val();
     });
-
-    // Postcode input formatting
-    const $postCodeInput = $("input[name='postcode']");
-    $postCodeInput.on("input", function () {
-        let value = $(this).val();
-
-        // Match 4 digits followed by 2 letters (e.g., 1234AB)
-        const match = value.match(/^(\d{4})([a-zA-Z]{2})$/);
-
-        if (match) {
-            // Add space between numbers and letters
-            const formatted = `${match[1]} ${match[2]}`;
-            $(this).val(formatted);
-        }
-    });
 });

falcon/modules/is_favoriteproducts/views/templates/hook/button-product.tpl

@@ -1,29 +0,0 @@
-
-<div class="col-auto">
-    <a
-        class="product-page__action-btn btn btn-light shadow rounded-circle favorite-btn p-2"
-        href="#"
-        data-action="toggleFavorite"
-        data-active="false"
-        {if isset($product.id) && isset($product.id_product_attribute)}
-            data-key="{$product.id}_{$product.id_product_attribute}"
-        {/if}
-    >
-        <div class="favorite-btn__content favorite-btn__content--added">
-            {capture name="svg_output"}{svg_icon file='heart.svg' }{/capture}
-            {if $smarty.capture.svg_output}
-                {$smarty.capture.svg_output nofilter}
-            {else}
-                <span class="material-icons product-page__action-btn-icon d-block">favorite</span>
-            {/if}
-        </div>
-        <div class="favorite-btn__content favorite-btn__content--add">
-             {capture name="svg_output"}{svg_icon file='heart.svg' width="22"}{/capture}
-            {if $smarty.capture.svg_output}
-                {$smarty.capture.svg_output nofilter}
-            {else}
-                <span class="material-icons product-page__action-btn-icon d-block">favorite_border</span>
-            {/if}
-        </div>
-    </a>
-</div>

falcon/modules/is_favoriteproducts/views/templates/hook/button.tpl

@@ -1,28 +0,0 @@
-
-<a
-    class="product-miniature__functional-btn product-miniature__functional-btn--top btn btn-light shadow rounded-circle favorite-btn"
-    href="#"
-    data-action="toggleFavorite"
-    data-active="false"
-    {if isset($product.id) && isset($product.id_product_attribute)}
-        data-key="{$product.id}_{$product.id_product_attribute}"
-    {/if}
->
-    <div class="favorite-btn__content favorite-btn__content--added">
-        {capture name="svg_output"}{svg_icon file='heart.svg'}{/capture}
-        {if $smarty.capture.svg_output}
-            {$smarty.capture.svg_output nofilter}
-        {else}
-                <span class="material-icons product-miniature__functional-btn-icon d-block">favorite</span>
-        {/if}
-    </div>
-    <div class="favorite-btn__content favorite-btn__content--add">
-        {capture name="svg_output"}{svg_icon file='heart.svg' width="22"}{/capture}
-        {if $smarty.capture.svg_output}
-            {$smarty.capture.svg_output nofilter}
-        {else}
-            <span class="material-icons product-miniature__functional-btn-icon d-block">favorite_border</span>
-        {/if}
-        
-    </div>
-</a>

falcon/modules/is_searchbar/views/templates/hook/is_searchbar.tpl

@@ -9,12 +9,7 @@
 					   name="s"
 					   value="{$search_string}">
 				<button type="submit" class="search-form__btn btn">
-                    {capture name="svg_output"}{svg_icon file='search.svg'}{/capture}
+					<span class="material-icons">search</span>
-                    {if $smarty.capture.svg_output}
-                        {$smarty.capture.svg_output nofilter}
-                    {else}
-                        <span class="header-top__icon material-icons">search</span>
-                    {/if}
 				</button>
 			</div>
 		</form>

falcon/modules/ps_contactinfo/ps_contactinfo.tpl

@@ -28,13 +28,7 @@
   <div class="d-flex align-items-center mb-3 justify-content-between position-relative">
     <span class="h4 mb-0">{l s='Store information' d='Shop.Theme.Global'}</span>
     <a href="#footer_contact_list" class="icon-collapse stretched-link text-reset d-block d-md-none" data-toggle="collapse">
-        {capture name="svg_output"}{svg_icon file='chevron_down.svg'}{/capture}
-        {if $smarty.capture.svg_output}
-        <span style="margin-bottom: 3px;">
-            {$smarty.capture.svg_output nofilter}
-        {else}
       <i class="material-icons d-block"></i>
-        {/if}
     </a>
   </div>
 

falcon/modules/ps_customeraccountlinks/ps_customeraccountlinks.tpl

@@ -28,13 +28,7 @@
   <div class="d-flex align-items-center mb-3 justify-content-between position-relative">
     <span class="h4 mb-0">{l s='Your account' d='Shop.Theme.Customeraccount'}</span>
     <a href="#footer_account_list" class="icon-collapse stretched-link text-reset d-block d-md-none" data-toggle="collapse">
-        {capture name="svg_output"}{svg_icon file='chevron_down.svg'}{/capture}
-        {if $smarty.capture.svg_output}
-        <span style="margin-bottom: 3px;">
-            {$smarty.capture.svg_output nofilter}
-        {else}
       <i class="material-icons d-block"></i>
-        {/if}
     </a>
   </div>
 

falcon/modules/ps_customersignin/ps_customersignin.tpl

@@ -33,24 +33,8 @@
       title="{l s='Log in to your customer account' d='Shop.Theme.Customeraccount'}"
     {/if}
   >
-    <span class="d-none d-xl-block text-secondary">
-        {if $logged}
-            {if $customer.firstname}
-                {$customer.firstname|escape:'html':'UTF-8'}
-            {else}
-                {l s='Log out' d='Shop.Theme.Actions'}
-            {/if}
-        {else}
-            {l s='Log in' d='Shop.Theme.Actions'}
-        {/if}
-    </span>
     <div class="header-top__icon-container">
-        {capture name="svg_output"}{svg_icon file='person.svg'}{/capture}
-        {if $smarty.capture.svg_output}
-            {$smarty.capture.svg_output nofilter}
-        {else}
       <span class="header-top__icon material-icons">person</span>
-        {/if}
     </div>
   </a>
 </div>

falcon/modules/ps_linklist/views/templates/hook/linkblock-column.tpl

@@ -4,13 +4,7 @@
     <div class="d-flex align-items-center mb-3 justify-content-between position-relative">
       <span class="h4 mb-0">{$linkBlock.title}</span>
       <a href="#footer_sub_menu_{$_expand_id}" class="icon-collapse stretched-link text-reset d-block d-md-none" data-toggle="collapse">
-        {capture name="svg_output"}{svg_icon file='chevron_down.svg'}{/capture}
-        {if $smarty.capture.svg_output}
-        <span style="margin-bottom: 3px;">
-            {$smarty.capture.svg_output nofilter}
-        {else}
         <i class="material-icons d-block"></i>
-        {/if}
       </a>
     </div>
     <div id="footer_sub_menu_{$_expand_id}" class="collapse d-md-block">

falcon/modules/ps_linklist/views/templates/hook/linkblock.tpl

@@ -23,38 +23,13 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  *}
 
-{* Simple display without titles for the header and footer *}
-{if $hookName == "displayFooterPrivacy"}
   {foreach $linkBlocks as $linkBlock}
-        {foreach $linkBlock.links as $link}
+    <div class="col-md-3 col-12 mb-lg-4">
-        <p class="links-list__elem mb-0">
-            <a
-                id="{$link.id}-{$linkBlock.id}"
-                class="{$link.class} links-list__link"
-                href="{$link.url}"
-                title="{$link.description}"
-                {if !empty($link.target)} target="{$link.target}" {/if}
-            >
-            {$link.title}
-            </a>
-        </p>
-        {/foreach}
-  {/foreach}
-{else}   
-{* Regular display *}
-  {foreach $linkBlocks as $linkBlock}
-    <div class="col-12 col-md-3">
       {assign var=_expand_id value=10|mt_rand:100000}
       <div class="d-flex align-items-center mb-3 justify-content-between position-relative">
         <span class="h4 mb-0">{$linkBlock.title}</span>
         <a href="#footer_sub_menu_{$_expand_id}" class="icon-collapse stretched-link text-reset d-block d-md-none" data-toggle="collapse">
-            {capture name="svg_output"}{svg_icon file='chevron_down.svg'}{/capture}
-            {if $smarty.capture.svg_output}
-            <span style="margin-bottom: 3px;">
-                {$smarty.capture.svg_output nofilter}
-            {else}
           <i class="material-icons d-block"></i>
-            {/if}
         </a>
       </div>
       <div id="footer_sub_menu_{$_expand_id}" class="collapse d-md-block">
@@ -76,4 +51,3 @@
       </div>
     </div>
   {/foreach}
-{/if}

falcon/modules/ps_mainmenu/ps_mainmenu.tpl

@@ -21,14 +21,9 @@
             >
               <span class="align-self-center">{$node.label}</span>
               {if $node.children|count}
-                {capture name="svg_output"}{svg_icon file='chevron_down.svg'}{/capture}
-                {if $smarty.capture.svg_output}
                 <span class="d-none d-md-block pl-1" style="margin-bottom: 3px;">
-                    {$smarty.capture.svg_output nofilter}
+                    {svg_icon file='chevron_down.svg' }  
                 </span>
-                {else}
-                    <i class="material-icons d-block"></i>
-                {/if}
               {/if}
             </a>
             {if $node.children|count}

falcon/templates/_partials/footer-copyright.tpl

@@ -1,8 +1,7 @@
-<div class="footer-bottom py-1 py-lg-3">
+<div class="footer-bottom py-3">
-    <div class="container">
+    <div class="container d-flex justify-content-between align-items-center">
-        <div class="row d-flex flex-column flex-lg-row justify-content-between align-items-center">
         <div class="copyright">
-                <span class="text-white fw-400">
+            <span>
                 {l
                   s='Copyright © %year% %shop%'
                   sprintf=['%year%' => $smarty.now|date_format:"%Y", '%shop%' => $shop.name|capitalize]
@@ -10,13 +9,17 @@
                 }
             </span>
         </div>
-            <a href="https://dewebsmid.nl/prestashop/" class="text-white fw-400" rel="noopener" target="_blank">
+        <a href="https://dewebsmid.nl/prestashop/" rel="noopener" target="_blank">
             {l s='PrestaShop' d='Shop.Theme.Footer'}
         </a>
-            <div class="privacy d-flex gap-20">
+        <div class="privacy">
-                {* Need to create this hook in the db. Use ps_linklist with it- see modules/ps_linklist/views/templates/hook/linkblock.tpl *}
+            <a href="content/3-gebruiks-voorwaarden">
-                {hook h='displayFooterPrivacy'}
+                {l s='Terms & Conditions' d='Shop.Theme.Footer'}
-            </div>
+            </a>
+            <span class="mx-2"> | </span>
+            <a href="content/1-levering">
+                {l s='Privacy policy' d='Shop.Theme.Footer'}
+            </a>
         </div>
     </div>
 </div>

falcon/templates/_partials/footer.tpl

@@ -29,7 +29,7 @@
     {/block}
   </div>
 </div>
-<div class="footer-container pb-0 mt-0">
+<div class="footer-container pb-0">
   <div class="container">
     <div class="row">
       {block name='hook_footer'}

falcon/templates/_partials/head.tpl

@@ -74,13 +74,9 @@
 {/block}
 
 {block name='stylesheets'}
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:ital,wght@0,200..800;1,200..800&display=swap" rel="stylesheet">
   {include file="_partials/stylesheets.tpl" stylesheets=$stylesheets}
 {/block}
 
-
 {block name='javascript_head'}
   {include file="_partials/javascript.tpl" javascript=$javascript.head vars=$js_custom_vars}
 {/block}

falcon/templates/_partials/header.tpl

@@ -37,6 +37,7 @@
         <div class="header-top js-header-top">
             <div class="header-top__content pb-md-0 py-2">
                 <div class="container">
+
                     <div class="row header-top__row">
 
                         <div class="col flex-grow-0 header-top__block header-top__block--menu-toggle d-block d-md-none">
@@ -83,6 +84,13 @@
                     </div>                       
                 </div>
             </div>
+            <div class="container header-main-menu">
+                <div class="row">
+                    <div class="col">
+                        {hook h='displayNavFullWidth'}  
+                    </div>
+                </div>   
+            </div>   
         </div>
     </div>
 {/block}

falcon/templates/_partials/pagination.tpl

@@ -26,12 +26,8 @@
 
 {block name='pagination_page_list'}
   {if $pagination.should_be_displayed}
-    <div class="d-flex justify-content-between align-items-center">
-        <div class="results__block">
-            {l s='%curr_numer% van %total_items% resultaten' sprintf=['%curr_numer%' => $pagination.items_shown_to,'%total_items%' => $pagination.total_items] d='Shop.Theme.Actions'}
-        </div>
     <nav>
-            <ul class="pagination justify-content-center m-0">
+      <ul class="pagination justify-content-center mt-4 mb-2">
         {foreach from=$pagination.pages item="page"}
           <li  class="page-item{if $page.current} active{/if} {if $page.type === 'spacer'}disabled{/if}">
             {if $page.type === 'spacer'}
@@ -63,6 +59,5 @@
         {/foreach}
       </ul>
     </nav>
-    </div>
   {/if}
 {/block}

falcon/templates/catalog/_partials/category-footer.tpl

@@ -1,13 +1,5 @@
-{* Defensive: Handles LazyArray objects for category *}
-{if is_object($category)}
-  {$category = $category|json_encode|json_decode:true}
-  {if isset($category.category)}
-    {$category = $category.category}
-  {/if}
-{/if}
-
 <div id="js-product-list-footer">
-    {if isset($category.additional_description) && $category.additional_description && $listing.pagination.items_shown_from == 1}
+    {if $category.additional_description && $listing.pagination.items_shown_from == 1}
       <div id="category-description-2" class="cms-content my-3">
         {$category.additional_description nofilter}
       </div>

falcon/templates/catalog/_partials/miniatures/brand.tpl

@@ -23,19 +23,24 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  *}
 {block name='brand_miniature_item'}
-  <li class="col-12 col-sm-6 col-lg-4 col-xl-3 mb-3">
+  <li class="col-lg-3 col-sm-4 col-6 mb-3">
     <div class="card h-100">
-      {$brand_url = $brand.image.bySize.home_default.url}
+      {$sizes = Image::getSize('home_default')}
       <img
         src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='{$sizes.width}' height='{$sizes.height}' viewBox='0 0 1 1'%3E%3C/svg%3E"
-        data-src="{$brand_url}"
+        data-src="{$brand.image|replace:'small_default':'home_default'}"
         alt="{$brand.name}"
         class="card-img-top lazyload"
         width="{$sizes.width}"
         height="{$sizes.height}"
         >
-      <div class="card-footer text-center">
+      <div class="card-body">
+        <p class="h6 mb-0">
           <a class="text-reset stretched-link" href="{$brand.url}">{$brand.name}</a>
+        </p>
+      </div>
+      <div class="card-footer text-center">
+        <span class="btn btn-link p-0">{$brand.nb_products}</span>
       </div>
     </div>
   </li>

falcon/templates/catalog/_partials/miniatures/product.tpl

@@ -26,7 +26,7 @@
   {$listingType = $type|default:'listing'}
   <div
     {if $listingType === 'listing'}
-      class="products-list__block col col-sm-6 col-lg-4 col-xl-3"
+      class="products-list__block products-list__block--grid"
     {elseif $listingType === 'slider'}
       class="swiper-slide product-slider__item col-6 col-md-4 col-lg-3"
     {/if}

falcon/templates/catalog/_partials/product-add-to-cart.tpl

@@ -26,8 +26,8 @@
   {if !$configuration.is_catalog}
 
     {block name='product_quantity'}
-      <div class="product-quantity row mb-1 align-items-center">
+      <div class="product-quantity row mb-1 mx-n1 mt-n2 align-items-center">
-        <div class="qty col-auto px-1">
+        <div class="qty col-12 col-sm-auto mx-auto mt-2 px-1">
           <input
             type="number"
             name="qty"
@@ -46,7 +46,7 @@
           >
         </div>
 
-        <div class="add col">
+        <div class="add col mt-2 px-1">
           <button
             class="btn btn-primary add-to-cart btn-block"
             data-button-action="add-to-cart"

falcon/templates/checkout/_partials/cart-detailed-product-line.tpl

@@ -130,7 +130,6 @@
             value="{$product.quantity}"
             name="product-quantity-spin"
             min="{$product.minimal_quantity}"
-            data-verticalbuttons="true"
             aria-label="{l s='%productName% product quantity field' sprintf=['%productName%' => $product.name] d='Shop.Theme.Checkout'}"
             />
         </div>

falcon/templates/checkout/_partials/cart-summary-totals.tpl

@@ -38,11 +38,6 @@
       <span class="label">{$cart.totals.total.label}&nbsp;{if $configuration.display_taxes_label && $configuration.taxes_enabled}{$cart.labels.tax_short}{/if}</span>
       <span class="value">{$cart.totals.total.value}</span>
     </div>
-     {if !$cart.has_delivery_address}
-      <p class="no_delivery_address_yet_message">
-        {l s='Shipping costs will be calculated in the next step, before you checkout. Shipping costs depend on the country the order is shipped to. For the Netherlands, orders with a value of € 125.00 will be shipped free of charge. You can view the shippingcosts <a href="https://www.nijssenbulbs.com/content/16-verzendkosten"><u>here</u></a>' d='Shop.Checkout.Total'}
-      </p>
-    {/if}
   {/if}
 {/block}
 

falcon/templates/checkout/_partials/steps/addresses.tpl

@@ -72,7 +72,7 @@
         {/if}
 
         <div class="add-address mt-2 mb-3">
-          <a class="btn btn-primary btn-sm" href="{$new_address_delivery_url}">{l s='add new address' d='Shop.Theme.Actions'}</a>
+          <a class="btn btn-outline-primary btn-sm" href="{$new_address_delivery_url}">{l s='add new address' d='Shop.Theme.Actions'}</a>
         </div>
 
         {if $use_same_address && !$cart.is_virtual}
@@ -116,7 +116,7 @@
           {/if}
 
           <div class="add-address mt-2 mb-3">
-            <a class="btn btn-primary btn-sm" href="{$new_address_invoice_url}">{l s='add new address' d='Shop.Theme.Actions'}</a>
+            <a class="btn btn-outline-primary btn-sm" href="{$new_address_invoice_url}">{l s='add new address' d='Shop.Theme.Actions'}</a>
           </div>
         {/if}
 

falcon/templates/checkout/cart.tpl

@@ -44,7 +44,7 @@
 
         {block name='continue_shopping'}
           <div class="my-3">
-            <a class="btn btn-primary" href="{$urls.pages.index}">
+            <a class="btn btn-outline-primary" href="{$urls.pages.index}">
               <span class="material-icons btn-icon mr-1">keyboard_arrow_left</span>
               {l s='Continue shopping' d='Shop.Theme.Actions'}
             </a>

falcon/templates/customer/customer-links.tpl

@@ -73,7 +73,7 @@
   </div>
 
   <div class="text-center customer-links__footer">
-    <a href="{$link->getPageLink('index', true, null, 'mylogout')}" class="customer-links__logout btn btn-secondary mt-2">
+    <a href="{$link->getPageLink('index', true, null, 'mylogout')}" class="customer-links__logout">
       {l s='Sign out' d='Shop.Theme.Actions'}
     </a>
   </div>

falcon/templates/customer/order-detail.tpl

@@ -66,7 +66,7 @@
 
       {if $order.details.reorder_url}
         <div class="mt-2 text-right">
-          <a href="{$order.details.reorder_url}" class="btn btn-primary">{l s='Reorder' d='Shop.Theme.Actions'}</a>
+          <a href="{$order.details.reorder_url}" class="btn btn-outline-primary">{l s='Reorder' d='Shop.Theme.Actions'}</a>
         </div>
       {/if}
 

falcon/templates/index.tpl

@@ -26,6 +26,12 @@
 
     {block name='page_content_container'}
       <section id="content" class="page-home">
-        {* {include file='pages/index/hero.tpl'} *}
+        {block name='page_content_top'}{/block}
+
+        {block name='page_content'}
+          {block name='hook_home'}
+            {$HOOK_HOME nofilter}
+          {/block}
+        {/block}
       </section>
     {/block}

falcon/templates/layouts/layout-both-columns.tpl

@@ -42,7 +42,7 @@
         {include file='catalog/_partials/product-activation.tpl'}
       {/block}
 
-      <header id="header" class="l-header mb-0">
+      <header id="header" class="l-header">
         {block name='header'}
           {include file='_partials/header.tpl'}
         {/block}
@@ -55,12 +55,12 @@
         {/block}
 
         {hook h="displayWrapperTop"}
-        <div class="{if $page.page_name == 'index' } container-fluid p-0 overflow-hidden {else}container{/if}">
+        <div class="container">
           {block name='breadcrumb'}
             {include file='_partials/breadcrumb.tpl'}
           {/block}
 
-           <div {if $page.page_name != 'index' || !isset($page.body_classes['layout-full-width'])}class="row"{/if}>
+          <div class="row">
             {block name="left_column"}
               <div id="left-column" class="col-12 col-md-4 col-lg-3">
                 {if $page.page_name == 'product'}
@@ -95,7 +95,7 @@
         {hook h="displayWrapperBottom"}
       </section>
 
-      <footer id="footer" class="l-footer js-footer mt-0">
+      <footer id="footer" class="l-footer js-footer">
         {block name="footer"}
           {include file="_partials/footer.tpl"}
         {/block}

falcon/templates/layouts/layout-full-width.tpl

@@ -28,7 +28,7 @@
 {block name='right_column'}{/block}
 
 {block name='content_wrapper'}
-   <div id="content-wrapper" class="{if $page.page_name != 'index' || !isset($page.body_classes['layout-full-width'])}col-12 {/if}js-content-wrapper">
+  <div id="content-wrapper" class="col-12 js-content-wrapper">
     {hook h="displayContentWrapperTop"}
     {block name='content'}
       <p>Hello world! This is HTML5 Boilerplate.</p>

falcon/templates/pages/index/hero.tpl

@@ -1,10 +0,0 @@
-{* hero section on home page *}
-<section id="home_hero" class="section-spacer-both">
-    <div class="container">
-        <div class="row">
-            <div class="col-12 col-md-8 col-xl-6">
-              
-            </div>
-        </div>
-    </div>
-</section>