Merge pull request #106 from PrestaShop/2.0.x

Merge 2.0.x to 2.1.x
PrestaShop · Feb 24, 2023 · 9cf6e28 · 9cf6e28
2 parents 9d2c79c + 39e5d6e
commit 9cf6e28
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 24 deletions.
diff --git a/_dev/css/components/categories.scss b/_dev/css/components/categories.scss
@@ -448,7 +448,6 @@
 @include media-breakpoint-down(sm) {
   #category {
     #left-column {
-      width: 100%;
 
       #search_filters_wrapper {
         margin-right: -30px;
@@ -542,10 +541,6 @@
       }
     }
 
-    #content-wrapper {
-      width: 100%;
-    }
-
     #search_filter_toggler {
       width: 100%;
     }
@@ -568,12 +563,6 @@
       padding-top: 1rem;
     }
   }
-
-  #prices-drop #content-wrapper,
-  #new-products #content-wrapper,
-  #best-sales #content-wrapper {
-    width: 100%;
-  }
 }
 
 @include media-breakpoint-down(xs) {
@@ -614,7 +603,6 @@
   }
 }
 
-
 @include media-breakpoint-down(md) {
   #products {
     .products {

diff --git a/templates/catalog/_partials/products-top.tpl b/templates/catalog/_partials/products-top.tpl
@@ -23,22 +23,20 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  *}
 <div id="js-product-list-top" class="row products-selection">
-  <div class="col-md-6 hidden-sm-down total-products">
+  <div class="col-lg-5 hidden-sm-down total-products">
     {if $listing.pagination.total_items > 1}
       <p>{l s='There are %product_count% products.' d='Shop.Theme.Catalog' sprintf=['%product_count%' => $listing.pagination.total_items]}</p>
     {elseif $listing.pagination.total_items > 0}
       <p>{l s='There is 1 product.' d='Shop.Theme.Catalog'}</p>
     {/if}
   </div>
-  <div class="col-md-6">
+  <div class="col-lg-7">
     <div class="row sort-by-row">
-
       {block name='sort_by'}
         {include file='catalog/_partials/sort-orders.tpl' sort_orders=$listing.sort_orders}
       {/block}
-
       {if !empty($listing.rendered_facets)}
-        <div class="col-sm-3 col-xs-4 hidden-md-up filter-button">
+        <div class="col-xs-4 col-sm-3 hidden-md-up filter-button">
           <button id="search_filter_toggler" class="btn btn-secondary js-search-toggler">
             {l s='Filter' d='Shop.Theme.Actions'}
           </button>

diff --git a/templates/catalog/_partials/sort-orders.tpl b/templates/catalog/_partials/sort-orders.tpl
@@ -23,8 +23,8 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  *}
 
-<span class="col-sm-3 col-md-3 hidden-sm-down sort-by">{l s='Sort by:' d='Shop.Theme.Global'}</span>
-<div class="{if !empty($listing.rendered_facets)}col-sm-9 col-xs-8{else}col-sm-12 col-xs-12{/if} col-md-9 products-sort-order dropdown">
+<span class="col-sm-3 col-md-5 hidden-sm-down sort-by">{l s='Sort by:' d='Shop.Theme.Global'}</span>
+<div class="{if !empty($listing.rendered_facets)}col-xs-8 col-sm-7{else}col-xs-12 col-sm-12{/if} col-md-9 products-sort-order dropdown">
   <button
     class="btn-unstyle select-title"
     rel="nofollow"

diff --git a/templates/layouts/layout-both-columns.tpl b/templates/layouts/layout-both-columns.tpl
@@ -64,7 +64,7 @@
 
           <div class="row">
             {block name="left_column"}
-              <div id="left-column" class="col-xs-12 col-sm-4 col-md-3">
+              <div id="left-column" class="col-xs-12 col-md-4 col-lg-3">
                 {if $page.page_name == 'product'}
                   {hook h='displayLeftColumnProduct' product=$product category=$category}
                 {else}
@@ -74,7 +74,7 @@
             {/block}
 
             {block name="content_wrapper"}
-              <div id="content-wrapper" class="js-content-wrapper left-column right-column col-sm-4 col-md-6">
+              <div id="content-wrapper" class="js-content-wrapper left-column right-column col-md-4 col-lg-3">
                 {hook h="displayContentWrapperTop"}
                 {block name="content"}
                   <p>Hello world! This is HTML5 Boilerplate.</p>
@@ -84,7 +84,7 @@
             {/block}
 
             {block name="right_column"}
-              <div id="right-column" class="col-xs-12 col-sm-4 col-md-3">
+              <div id="right-column" class="col-xs-12 col-md-4 col-lg-3">
                 {if $page.page_name == 'product'}
                   {hook h='displayRightColumnProduct'}
                 {else}

diff --git a/templates/layouts/layout-left-column.tpl b/templates/layouts/layout-left-column.tpl
@@ -27,7 +27,7 @@
 {block name='right_column'}{/block}
 
 {block name='content_wrapper'}
-  <div id="content-wrapper" class="js-content-wrapper left-column col-xs-12 col-sm-8 col-md-9">
+  <div id="content-wrapper" class="js-content-wrapper left-column col-xs-12 col-md-8 col-lg-9">
     {hook h="displayContentWrapperTop"}
     {block name='content'}
       <p>Hello world! This is HTML5 Boilerplate.</p>

diff --git a/templates/layouts/layout-right-column.tpl b/templates/layouts/layout-right-column.tpl
@@ -27,7 +27,7 @@
 {block name='left_column'}{/block}
 
 {block name='content_wrapper'}
-  <div id="content-wrapper" class="js-content-wrapper right-column col-xs-12 col-sm-8 col-md-9">
+  <div id="content-wrapper" class="js-content-wrapper right-column col-xs-12 col-md-8 col-lg-9">
     {hook h="displayContentWrapperTop"}
     {block name='content'}
       <p>Hello world! This is HTML5 Boilerplate.</p>