Merge pull request #526 from tblivet/theme-improvements

Improvements : small theme improvements

Author: kpodemski

modules/ps_imageslider/views/templates/hook/slider.tpl

@@ -20,7 +20,7 @@
             aria-hidden="{if $smarty.foreach.homeslider.first}false{else}true{/if}">
             {if !empty($slide.url)}<a class="carousel-link" href="{$slide.url}">{/if}
               <figure class="carousel-content">
-                <img src="{$slide.image_url}" alt="{$slide.legend|escape}" loading="lazy" {$slide.size|replace: '"':''}>
+                <img src="{$slide.image_url}" alt="{$slide.legend|escape}" {if $slide@iteration == 1}loading="eager"{else}loading="lazy"{/if} {$slide.size|replace: '"':''}>
                 {if $slide.title || $slide.description}
                   <figcaption class="carousel-caption caption">
                     <h2 class="display-1 text-uppercase">{$slide.title}</h2>

src/scss/core/components/_pagination.scss

@@ -9,6 +9,7 @@
 
   &-container {
     align-items: center;
-    margin: 1rem 0;
+    margin-top: 1rem;
+    margin-bottom: 1rem;
   }
 }

src/scss/core/pages/_home.scss

@@ -1,3 +1,2 @@
-@import "home";
 @import "product";
 @import "page-not-found";

src/scss/core/pages/_index.scss

@@ -31,10 +31,15 @@
     {if $product.ean13},"gtin13": "{$product.ean13}"
     {else if $product.upc},"gtin13": "{$product.upc}"
     {/if}
-    {if $product_manufacturer->name OR $shop.name},
+    {if $product_manufacturer->name},
+    "brand": {
+      "@type": "Brand",
+      "name": "{$product_manufacturer->name|escape:'html':'UTF-8'}"
+    }
+    {elseif $shop.name},
     "brand": {
       "@type": "Thing",
-      "name": "{if $product_manufacturer->name}{$product_manufacturer->name|escape:'html':'UTF-8'}{else}{$shop.name}{/if}"
+      "name": "{$shop.name}"
     }
     {/if}
     {if $hasAggregateRating},

templates/_partials/microdata/product-jsonld.tpl

@@ -5,13 +5,13 @@
 {$componentName = 'pagination'}
 
 <nav class="{$componentName}-container row">
-  <div class="{$componentName}-number col-md-4">
+  <div class="{$componentName}-number text-center text-lg-start col-lg-4">
     {block name='pagination_summary'}
       {l s='Showing %from%-%to% of %total% item(s)' d='Shop.Theme.Catalog' sprintf=['%from%' => $pagination.items_shown_from ,'%to%' => $pagination.items_shown_to, '%total%' => $pagination.total_items]}
     {/block}
   </div>
 
-  <div class="{$componentName}-list-container col-md-6 offset-md-2 pr-0">
+  <div class="{$componentName}-list-container d-flex justify-content-center justify-content-lg-end col-lg-8">
     {block name='pagination_page_list'}
       <nav aria-label="{l s='Products pagination' d='Shop.Theme.Catalog'}">
         {if $pagination.should_be_displayed}
@@ -44,5 +44,4 @@
       </nav>
     {/block}
   </div>
-
 </nav>

templates/_partials/pagination.tpl

@@ -4,6 +4,8 @@
  *}
 {extends file=$layout}
 
+{block name='breadcrumb'}{/block}
+
 {block name="content_columns"}
   {block name="left_column"}{/block}