diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2504afee..1cdc7633 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,435 +11,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - + + + + + - + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + @@ -450,10 +122,6 @@ - - - - @@ -718,7 +394,8 @@ - @@ -733,10 +410,10 @@ - + - + @@ -810,10 +487,10 @@ - + - + diff --git a/config/xml/blog-fr.xml b/config/xml/blog-fr.xml index 5b9f6448..dd17c812 100644 --- a/config/xml/blog-fr.xml +++ b/config/xml/blog-fr.xml @@ -6,6 +6,14 @@ fr + Les paiements de A à Z - Chapitre 3 : Accepter et gérer les moyens de paiement locaux + https://www.prestashop.com/fr/blog/gerer-paiement-locaux + Pour ce 3e chapitre de notre saga dédiée au paiement, nous vous proposons de nous arrêter sur les moyens utilisés par les consommateurs pour rég + Mon, 02 Nov 2020 10:44:53 +0100 + Lucie Gimon FR + https://www.prestashop.com/fr/blog/gerer-paiement-locaux + + 6 preuves sociales pour construire une relation de confiance immédiate avec vos prospects https://www.prestashop.com/fr/blog/preuves-sociales-confiance Si vous pensez que seul votre site e-commerce suffit à construire une relation de confiance solide avec vos clients, vous faîtes erreurs. @@ -76,14 +84,6 @@ Tue, 06 Oct 2020 18:05:33 +0200 Loudvic Salcède https://www.prestashop.com/fr/blog/hyperpersonnalisation-marketing-automation - - - Livraison le jour même : la nouvelle norme de l'e-commerce ? - https://www.prestashop.com/fr/blog/livraison-jour-meme - L'industrie du e-commerce a de beaux jours devant elle. Ce mode de consommation à la croissance continue est devenu une habitude pour beaucoup de consommateurs. - Mon, 05 Oct 2020 17:03:17 +0200 - Mickaël Benamran - https://www.prestashop.com/fr/blog/livraison-jour-meme diff --git a/config/xml/default_country_modules_list.xml b/config/xml/default_country_modules_list.xml index 3e41ca65..427b5da8 100644 --- a/config/xml/default_country_modules_list.xml +++ b/config/xml/default_country_modules_list.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/config/xml/must_have_modules_list.xml b/config/xml/must_have_modules_list.xml index b41bcd72..3b29c077 100644 --- a/config/xml/must_have_modules_list.xml +++ b/config/xml/must_have_modules_list.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/img/c/11-category_default.jpg b/img/c/11-category_default.jpg index cd1fc661..4d10e6ce 100644 Binary files a/img/c/11-category_default.jpg and b/img/c/11-category_default.jpg differ diff --git a/img/c/11-small_default.jpg b/img/c/11-small_default.jpg index 1e63f031..3cd13f3d 100644 Binary files a/img/c/11-small_default.jpg and b/img/c/11-small_default.jpg differ diff --git a/img/c/11.jpg b/img/c/11.jpg index 80f4a4f9..570f5ebb 100644 Binary files a/img/c/11.jpg and b/img/c/11.jpg differ diff --git a/img/c/14-category_default.jpg b/img/c/14-category_default.jpg index 9d7189ac..cb0b0a91 100644 Binary files a/img/c/14-category_default.jpg and b/img/c/14-category_default.jpg differ diff --git a/img/c/14-small_default.jpg b/img/c/14-small_default.jpg index f846729a..3a22380d 100644 Binary files a/img/c/14-small_default.jpg and b/img/c/14-small_default.jpg differ diff --git a/img/c/14.jpg b/img/c/14.jpg index 79940068..1c0fd5ce 100644 Binary files a/img/c/14.jpg and b/img/c/14.jpg differ diff --git a/img/c/17-category_default.jpg b/img/c/17-category_default.jpg new file mode 100644 index 00000000..357aeebe Binary files /dev/null and b/img/c/17-category_default.jpg differ diff --git a/img/c/17-small_default.jpg b/img/c/17-small_default.jpg new file mode 100644 index 00000000..8610e700 Binary files /dev/null and b/img/c/17-small_default.jpg differ diff --git a/img/c/17.jpg b/img/c/17.jpg new file mode 100644 index 00000000..e915be58 Binary files /dev/null and b/img/c/17.jpg differ diff --git a/img/c/18-category_default.jpg b/img/c/18-category_default.jpg new file mode 100644 index 00000000..83a43b9c Binary files /dev/null and b/img/c/18-category_default.jpg differ diff --git a/img/c/18-small_default.jpg b/img/c/18-small_default.jpg new file mode 100644 index 00000000..bc22f254 Binary files /dev/null and b/img/c/18-small_default.jpg differ diff --git a/img/c/18.jpg b/img/c/18.jpg new file mode 100644 index 00000000..4941d23d Binary files /dev/null and b/img/c/18.jpg differ diff --git a/img/c/19-category_default.jpg b/img/c/19-category_default.jpg new file mode 100644 index 00000000..63266bfd Binary files /dev/null and b/img/c/19-category_default.jpg differ diff --git a/img/c/19-small_default.jpg b/img/c/19-small_default.jpg new file mode 100644 index 00000000..7776f0cb Binary files /dev/null and b/img/c/19-small_default.jpg differ diff --git a/img/c/19.jpg b/img/c/19.jpg new file mode 100644 index 00000000..bbefcaf7 Binary files /dev/null and b/img/c/19.jpg differ diff --git a/img/c/20-category_default.jpg b/img/c/20-category_default.jpg new file mode 100644 index 00000000..a288135c Binary files /dev/null and b/img/c/20-category_default.jpg differ diff --git a/img/c/20-small_default.jpg b/img/c/20-small_default.jpg new file mode 100644 index 00000000..192a17b4 Binary files /dev/null and b/img/c/20-small_default.jpg differ diff --git a/img/c/20.jpg b/img/c/20.jpg new file mode 100644 index 00000000..32e54a05 Binary files /dev/null and b/img/c/20.jpg differ diff --git a/img/c/6-category_default.jpg b/img/c/6-category_default.jpg index eeb101f8..63266bfd 100644 Binary files a/img/c/6-category_default.jpg and b/img/c/6-category_default.jpg differ diff --git a/img/c/6-small_default.jpg b/img/c/6-small_default.jpg index 6fce6061..7776f0cb 100644 Binary files a/img/c/6-small_default.jpg and b/img/c/6-small_default.jpg differ diff --git a/img/c/6.jpg b/img/c/6.jpg index 119ee95d..bbefcaf7 100644 Binary files a/img/c/6.jpg and b/img/c/6.jpg differ diff --git a/img/tmp/PSBD4FVQ b/img/tmp/PSBD4FVQ new file mode 100644 index 00000000..3106bf85 Binary files /dev/null and b/img/tmp/PSBD4FVQ differ diff --git a/img/tmp/category_11-thumb.jpg b/img/tmp/category_11-thumb.jpg new file mode 100644 index 00000000..a2831115 Binary files /dev/null and b/img/tmp/category_11-thumb.jpg differ diff --git a/img/tmp/category_11.jpg b/img/tmp/category_11.jpg new file mode 100644 index 00000000..0793d7da Binary files /dev/null and b/img/tmp/category_11.jpg differ diff --git a/themes/classic-child/assets/css/custom.css b/themes/classic-child/assets/css/custom.css index 35952a16..5218485e 100644 --- a/themes/classic-child/assets/css/custom.css +++ b/themes/classic-child/assets/css/custom.css @@ -113,6 +113,12 @@ a:hover { margin-top: 50px; margin-bottom: -20px; } + +.products-sort-order .select-title { + width: 75%; + border: none; +} + /* Pour masquer le lien "Tous les produits" */ #index .all-product-link{display:none!important;}