fix(extra-features): Product card grid now uses bootstrap cols

The product cards should use bootstrap instead of display grid for easier edits and consistency
fet(extra-fetures): Pagination results text
2026-01-09 15:51:22 +01:00 · 2026-01-09 15:41:10 +01:00 · 2026-01-09 14:22:34 +01:00 · 2026-01-09 10:53:45 +01:00 · 2026-01-09 10:52:21 +01:00 · 2026-01-09 10:17:29 +01:00
23 changed files with 248 additions and 204 deletions
--- a/falcon/_dev/css/abstracts/variables/bootstrap/_colors.scss
+++ b/falcon/_dev/css/abstracts/variables/bootstrap/_colors.scss
@ -23,20 +23,11 @@ $green: #28a745;
 $teal:    #20c997;
 $cyan:    #17a2b8;

+$primary:       $blue;
+$secondary:     $gray-600;
 $success:       $green;
 $info:          $cyan;
 $warning:       #ff9a52;
 $danger:        $red;
 $light:         $gray-100;
 $dark:          $gray-800;
-
-$primary: $blue;
-$secondary: $gray-600;
-
-// Map for utility classes
-$theme-colors: (
-    "primary": $primary,
-    "secondary": $secondary,
-    //"tertiary": $tertiary,
-    //"quaternary": $quaternary,,
-);
--- a/falcon/_dev/css/theme/_index.scss
+++ b/falcon/_dev/css/theme/_index.scss
@ -5,3 +5,4 @@
@import "layout/index";
@import "components/index";

+@import "custom/custom";
--- a/falcon/_dev/css/theme/custom/_custom.scss
+++ b/falcon/_dev/css/theme/custom/_custom.scss
@ -10,10 +10,10 @@ Look up all available Bootstrap variables here: https://rstudio.github.io/bslib/
 */

 //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/base";
+//@import "abstracts/utilities";

 // Components: parts of the theme itself that are not associated with a module.
 //@import "components/buttons";
--- a/falcon/_dev/css/theme/custom/abstracts/_functions.scss
+++ b/falcon/_dev/css/theme/custom/abstracts/_functions.scss
@ -8,10 +8,34 @@
    }
 }

+// 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
+// Generates utility classes like .gap-4, .gap-col-4, .gap-row-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);
 }
--- a/falcon/_dev/css/theme/custom/abstracts/_mixins.scss
+++ b/falcon/_dev/css/theme/custom/abstracts/_mixins.scss
@ -46,7 +46,7 @@
 // Mixin to add an after pseudo-element with a mask image to customize button colors
 /* Example: 

-.btn{
+.btn-arrow-right{
    &::after {
        @include btn-after("../img/arrow-right.svg");
    }
--- a/falcon/_dev/css/theme/custom/abstracts/_utilities.scss
+++ b/falcon/_dev/css/theme/custom/abstracts/_utilities.scss
@ -1,30 +1,32 @@
-// Spacers
-$section-spacer: rem-calc(50px);
-$section-spacer-small: rem-calc(25px);
-
-.section-spacer {
-    margin-top: $section-spacer;
-    @include bs5-media-breakpoint-up(lg) {
-        margin-top: calc($section-spacer * 1.5);
-    }
-    &--small {
-        margin-top: $section-spacer-small;
-        @include bs5-media-breakpoint-up(lg) {
-            margin-top: calc($section-spacer-small * 1.5);
-        }
-    }
-}
-
 // Header selector for interpolation
 // Example usage: #{$headings} { ... }
 $headings: "h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6";

-// Background
-.bg__block {
-    // background: url(../img/bg.svg) repeat center center, $tertiary;
+// Section Spacers
+$section-spacer: rem-calc(50px);
+$section-spacer-small: rem-calc(25px);
+
+.section-spacer-both {
+    margin-top: $section-spacer;
+    margin-bottom: $section-spacer;
+    @include bs5-media-breakpoint-up(lg) {
+        margin-top: calc($section-spacer * 1.5);
+        margin-bottom: calc($section-spacer * 1.5);
+    }
+    &--small {
+        margin-top: $section-spacer-small;
+        margin-bottom: $section-spacer-small;
+        @include bs5-media-breakpoint-up(lg) {
+            margin-top: calc($section-spacer-small * 2);
+            margin-bottom: calc($section-spacer-small * 2);
+        }
+    }
 }

-// Border
-.bordered {
-    border: 1px solid $border-color !important;
+.section-spacer {
+    @extend .section-spacer-both;
+    margin-bottom: unset;
+    &--small {
+        margin-bottom: unset;
+    }
 }
--- a/falcon/_dev/css/theme/custom/components/_buttons.scss
+++ b/falcon/_dev/css/theme/custom/components/_buttons.scss
@ -13,14 +13,4 @@ $btn-color: (
    .btn-sm-#{$name} {
        color: $color !important;
    }
-    .btn-outline-#{$name},
-    .btn-lg-outline-#{$name},
-    .btn-sm-outline-#{$name} {
-        color: $color;
-        &:hover,
-        &:focus,
-        &:active {
-            color: $color !important;
-        }
-    }
 }
--- a/falcon/_dev/js/theme/index.js
+++ b/falcon/_dev/js/theme/index.js
@ -79,4 +79,19 @@ $(() => {
    $(".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);
+        }
+    });
 });
--- a/falcon/modules/is_favoriteproducts/views/templates/hook/button-product.tpl
+++ b/falcon/modules/is_favoriteproducts/views/templates/hook/button-product.tpl
@ -18,7 +18,7 @@
            {/if}
        </div>
        <div class="favorite-btn__content favorite-btn__content--add">
-             {capture name="svg_output"}{svg_icon file='heart.svg'}{/capture}
+             {capture name="svg_output"}{svg_icon file='heart.svg' width="22"}{/capture}
            {if $smarty.capture.svg_output}
                {$smarty.capture.svg_output nofilter}
            {else}
--- a/falcon/modules/is_favoriteproducts/views/templates/hook/button.tpl
+++ b/falcon/modules/is_favoriteproducts/views/templates/hook/button.tpl
@ -17,7 +17,7 @@
        {/if}
    </div>
    <div class="favorite-btn__content favorite-btn__content--add">
-        {capture name="svg_output"}{svg_icon file='heart.svg'}{/capture}
+        {capture name="svg_output"}{svg_icon file='heart.svg' width="22"}{/capture}
        {if $smarty.capture.svg_output}
            {$smarty.capture.svg_output nofilter}
        {else}
--- a/falcon/modules/ps_contactinfo/ps_contactinfo.tpl
+++ b/falcon/modules/ps_contactinfo/ps_contactinfo.tpl
@ -28,7 +28,13 @@
  <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>

--- a/falcon/modules/ps_customeraccountlinks/ps_customeraccountlinks.tpl
+++ b/falcon/modules/ps_customeraccountlinks/ps_customeraccountlinks.tpl
@ -28,7 +28,13 @@
  <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>

--- a/falcon/modules/ps_customersignin/ps_customersignin.tpl
+++ b/falcon/modules/ps_customersignin/ps_customersignin.tpl
@ -34,7 +34,12 @@
    {/if}
  >
    <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>
--- a/falcon/modules/ps_linklist/views/templates/hook/linkblock-column.tpl
+++ b/falcon/modules/ps_linklist/views/templates/hook/linkblock-column.tpl
@ -4,7 +4,13 @@
    <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">
--- a/falcon/modules/ps_linklist/views/templates/hook/linkblock.tpl
+++ b/falcon/modules/ps_linklist/views/templates/hook/linkblock.tpl
@ -29,7 +29,13 @@
      <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">
--- a/falcon/modules/ps_mainmenu/ps_mainmenu.tpl
+++ b/falcon/modules/ps_mainmenu/ps_mainmenu.tpl
@ -21,9 +21,14 @@
            >
              <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;">
-                    {svg_icon file='chevron_down.svg' }  
+                    {$smarty.capture.svg_output nofilter}
                </span>
+                {else}
+                    <i class="material-icons d-block"></i>
+                {/if}
              {/if}
            </a>
            {if $node.children|count}
--- a/falcon/templates/_partials/header.tpl
+++ b/falcon/templates/_partials/header.tpl
@ -33,20 +33,6 @@
 {/block}

 {block name='header_top'}
-    {* Optional: Add USP bar at the top of the header
-    Uncomment the code below to enable it 
-    Use the uspanywhere module and hook to "displayHeaderTopUsps" *}
-
-    {*
-    <div class="header-cta d-none d-lg-block py-2 py-lg-3 bg-primary">
-        <div class="container">
-            <div class="row d-flex gap-20">
-                {hook h='displayHeaderTopUsps'}
-            </div>
-        </div> 
-    </div> 
-    *}
-
    <div class="js-header-top-wrapper">
        <div class="header-top js-header-top">
            <div class="header-top__content pb-md-0 py-2">
--- a/falcon/templates/_partials/pagination.tpl
+++ b/falcon/templates/_partials/pagination.tpl
@ -26,8 +26,12 @@

 {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 mt-4 mb-2">
+            <ul class="pagination justify-content-center m-0">
                {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'}
@ -59,5 +63,6 @@
                {/foreach}
            </ul>
        </nav>
+    </div>
  {/if}
 {/block}
--- a/falcon/templates/catalog/_partials/category-footer.tpl
+++ b/falcon/templates/catalog/_partials/category-footer.tpl
@ -1,5 +1,13 @@
+{* 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 $category.additional_description && $listing.pagination.items_shown_from == 1}
+    {if isset($category.additional_description) && $category.additional_description && $listing.pagination.items_shown_from == 1}
      <div id="category-description-2" class="cms-content my-3">
        {$category.additional_description nofilter}
      </div>
--- a/falcon/templates/catalog/_partials/miniatures/product.tpl
+++ b/falcon/templates/catalog/_partials/miniatures/product.tpl
@ -26,7 +26,7 @@
  {$listingType = $type|default:'listing'}
  <div
    {if $listingType === 'listing'}
-      class="products-list__block products-list__block--grid"
+      class="products-list__block col col-sm-6 col-lg-4 col-xl-3"
    {elseif $listingType === 'slider'}
      class="swiper-slide product-slider__item col-6 col-md-4 col-lg-3"
    {/if}
--- a/falcon/templates/index.tpl
+++ b/falcon/templates/index.tpl
@ -29,23 +29,6 @@
        {block name='page_content_top'}{/block}

        {block name='page_content'}
-          {* Define containers, rows and columns here for each section *}
-          {* Example:
-
-          <section id="home_hero" class="mt-0">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-6 displayCustomhtml1">
-                            {hook h='displayCustomhtml1'}
-                        </div>
-                        <div class="col-6 displayHomeBanner1">
-                            {hook h='displayHomeBanner1'}
-                        </div>
-                    </div>
-                </div>
-            </section>
-
-          *}
          {block name='hook_home'}
            {$HOOK_HOME nofilter}
          {/block}
--- a/falcon/templates/layouts/layout-both-columns.tpl
+++ b/falcon/templates/layouts/layout-both-columns.tpl
@ -49,15 +49,18 @@
      </header>

      <section id="wrapper">
+
        {block name='notifications'}
          {include file='_partials/notifications.tpl'}
        {/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'}
@ -67,6 +70,7 @@
                {/if}
              </div>
            {/block}
+
            {block name="content_wrapper"}
              <div id="content-wrapper" class="js-content-wrapper left-column right-column col-md-4 col-lg-6">
                {hook h="displayContentWrapperTop"}
@ -76,6 +80,7 @@
                {hook h="displayContentWrapperBottom"}
              </div>
            {/block}
+
            {block name="right_column"}
              <div id="right-column" class="col-12 col-md-4 col-lg-3">
                {if $page.page_name == 'product'}
--- a/falcon/templates/layouts/layout-full-width.tpl
+++ b/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>
Author	SHA1	Message	Date
Isabelle	98ccf560c9	fix(extra-features): Product card grid now uses bootstrap cols The product cards should use bootstrap instead of display grid for easier edits and consistency	2026-01-09 15:51:22 +01:00
Isabelle	e393572081	fet(extra-fetures): Pagination results text Shows "12 van 15 resultaten" for example right acorss from the pagination	2026-01-09 15:41:10 +01:00
Isabelle	e37cafd839	fix(extra-features): Remove btn-outline in loop The colors for btn-outline should be the same as the border	2026-01-09 14:22:34 +01:00
Isabelle	1bf0ea3450	Merge branch 'feature/falcon-PS9' into feature/extra-features	2026-01-09 10:53:45 +01:00
Isabelle	a128906dc0	fix(falcon-PS9): prevent 500 error on AJAX filtering by normalizing data Resolved a Fatal Error occurring during AJAX product listing requests (e.g., price slider). - Issue: In PHP 8.2+, accessing properties of a 'CategoryLazyArray' object using array syntax (dot notation) triggers a Fatal Error. - Cause: The Faceted Search module returns a LazyArray object during XHR requests, whereas standard page loads provide a native array. - Solution: Implemented a normalization block using JSON serialization to flatten the object into a standard associative array. This ensures template syntax compatibility regardless of the request type or property visibility (protected vs public).	2026-01-09 10:52:21 +01:00
Isabelle	ddec414409	fix(falcon-PS9): Auto-format postcode This removes the annoying error when you type in 8011XD instead of 8011 XD	2026-01-09 10:17:29 +01:00
Isabelle	2f8a8bf527	feat(extra-features): Add section-spacer utility class This is a class used to standardize spacing between sections of the site, especially the home page.	2026-01-06 11:54:52 +01:00
Isabelle	e4c471684f	feat(extra-features): Add more helpful functions	2026-01-06 11:40:34 +01:00
Isabelle	d38338b360	Merge remote-tracking branch 'origin/dewebsmid' into restore-old	2025-12-31 19:15:05 +01:00
Isabelle	cb65915c7c	Merge remote-tracking branch 'origin/feature/svg_icon' into restore-old	2025-12-31 19:12:56 +01:00
Isabelle	10aabb24a9	Merge branch 'feature/scss' into dewebsmid	2025-12-31 18:24:50 +01:00
Isabelle	a8869adad6	Merge branch 'feature/svg_icon' into dewebsmid	2025-12-31 18:22:08 +01:00
Isabelle	ff9b9a3570	feat(scss): Replace font-size-base to 14px This has been standard in the projects I've worked on so far so might as well replace it.	2025-12-31 16:57:43 +01:00
Isabelle	47f985815a	feat(scss): Add gap and font-size utility functions	2025-12-31 16:56:10 +01:00
Isabelle	8c79477559	feat(scss): Add bootstrap-5-like grids & media queries This branch is just for "good to have" optional stand-alone sass features. In this commit, I aimed to make some things more like bootstrap 5 for ease of use. I changed the grid breakpoints to match that of Bootstrap 5's and added media query mixins that are more logical like in bootstrap 5.	2025-12-31 16:54:02 +01:00
Isabelle	5c7750e15d	feat(svg_icon): Add chevron_down to footer & menu	2025-12-31 16:25:51 +01:00
Isabelle	523c7d573c	feat(svg_icon): Add svg_icon support for header	2025-12-31 16:25:51 +01:00
Isabelle	6af020d81f	feat(svg-icon): Add svg_icon support for favoriteproducts module	2025-12-31 16:25:51 +01:00
Isabelle	f2192d11db	feat(svg_icon): Add checkmark icon	2025-12-31 16:25:51 +01:00
Isabelle	982dc10038	feat(svg_icon): Add x icon; add svg_icon support for header heart icon	2025-12-31 16:25:51 +01:00
Isabelle	4d7880fcec	feat(svg_icon): Fixed some icon svg codes, added hamburger-menu icon	2025-12-31 16:25:51 +01:00
Isabelle	fd595a0e15	feat(svg_icon): Add standard svg icons -Adds icons to use with the svg_icon smarty helper in the is_themecore module. See is_themecore-PS9 repo. - Uses chevron svg icons by default on bootstrap touchspin AND on main menu if it has children.	2025-12-31 16:25:51 +01:00
Isabelle	3e96574e0a	Merge branch 'feature/falcon-PS9'	2025-12-31 16:19:19 +01:00
Isabelle	48e776d80d	feat(falcon-PS9): Add custom.scss file to follow 7-in-1 structure	2025-12-31 16:19:02 +01:00