Modif border-radius sur smartphone + modifications dans le template email custo

templates/email/boutique/I18n/fr_FR.php

@@ -1,6 +1,6 @@
 <?php
 
-return [
+return array(
     '* Billing address' => '* Adresse de facturation',
     '* Delivery address' => '* Adresse de livraison',
     '* Items ordered:' => '* Articles commandés',
@@ -14,7 +14,7 @@ return [
     'Delivery address:' => 'Adresse de livraison : ',
     'Delivery method:' => 'Livré par : ',
     'Email not displaying correctly?' => 'Le mail ne s\'affiche pas correctement ?',
-    'For any questions, or concerns, feel free to contact <a href="mailto:%mail" style="color:#3c69c1;text-decoration:none" target="_blank">%mail</a>.' => 'Pour toutes questions contactez nous par mail : <a href="mailto:%mail" style="color:#3c69c1;text-decoration:none" target="_blank">%mail</a>.',
+    'For any questions, or concerns, feel free to contact <a href="mailto:%mail" style="color:#3c69c1;text-decoration:none" target="_blank">%mail</a>.' => 'Pour toute question, contactez nous par email : <a href="mailto:%mail" style="color:#3c69c1;text-decoration:none" target="_blank">%mail</a>.',
     'Have a nice day.' => 'Bonne journée.',
     'Hello' => 'Bonjour',
     'Hello,' => 'Bonjour,',
@@ -29,7 +29,7 @@ return [
     'Order Number:' => 'Commande N° : ',
     'Order Total' => 'Total de la commande',
     'Order Total:' => 'Total de la commande : ',
-    'Our contact us at:' => 'Contactez nous au',
+    'Our contact us at:' => 'Notre adresse',
     'Our mailing address is:' => 'Adresse postale',
     'Paid With:' => 'Payé par : ',
     'Price in' => 'Prix en',
@@ -39,11 +39,11 @@ return [
     'Shipping:' => 'Frais de livraison',
     'Support' => 'SAV',
     'Thank you for your order!' => 'Merci pour votre commande',
-    'Thanks' => 'Merci',
+    'Thanks' => 'Merci de votre confiance',
     'The %store team.' => 'L\'équipe %store.',
     'Thelia V2' => 'Thelia v2',
     'To login, please use the email address <span style="font-family: courier, fixed; font-size: 120%">%email</span>' => 'Pour vous connecter, merci d\'utiliser l\'adresse e-mail <span style="font-family: courier, fixed; font-size: 120%">%email</span>',
-    'Total' => 'Total',
+    'Total' => 'Total (avec remise)',
     'Total due   : %amount' => 'Total à payer : %amount',
     'Unit price : %amount' => 'Prix unitaire : %amount',
     'View it in your browser' => 'Voir dans le navigateur',
@@ -65,4 +65,4 @@ return [
     'Your order confirmation Nº %ref' => 'Confirmation de commande N° %ref',
     'Your password for %store' => 'Votre mot de passe pour %store',
     'Your password is <span style="font-family: courier, fixed; font-size: 120%">%pass</span>' => 'Votre mot de passe est <span style="font-family: courier, fixed; font-size: 120%">%pass</span>',
-];
+);

templates/email/boutique/default-html-layout.tpl

@@ -20,7 +20,7 @@ DO NOT DELETE THIS FILE, some plugins may use it.
 *}
 
 {* Set the default translation domain, that will be used by {intl} when the 'd' parameter is not set *}
-{default_translation_domain domain='email.default'}
+{default_translation_domain domain='email.boutique'}
 {default_locale locale={$locale}}
 
 {block name='message-body'}{$message_body nofilter}{/block}

templates/email/boutique/default-text-layout.tpl

@@ -20,7 +20,7 @@ DO NOT DELETE THIS FILE, some plugins may use it.
 *}
 
 {* Set the default translation domain, that will be used by {intl} when the 'd' parameter is not set *}
-{default_translation_domain domain='email.default'}
+{default_translation_domain domain='email.boutique'}
 {default_locale locale={$locale}}
 
 {block name='message-body'}{$message_body nofilter}{/block}

templates/email/boutique/email-layout.tpl

@@ -1,4 +1,4 @@
-{default_translation_domain domain='email.default'}
+{default_translation_domain domain='email.boutique'}
 {default_locale locale={$locale}}
 {declare_assets directory='assets'}
 {assign var="url_site" value="{config key="url_site"}"}
@@ -393,7 +393,7 @@ body,#bodyTable{
                                                     {if $image == null}
                                                         {$image = {image file='assets/img/logo.gif' failsafe=true}}
                                                     {/if}
-                                                    <img src="{$image}" alt="{$company_name}" border="0" style="border: 0px none;border-color: ;border-style: none;border-width: 0px;height: 75px;width: 135px;margin: 0;padding: 0;line-height: 100%;outline: none;text-decoration: none;" width="135" height="75">
+                                                    <img src="{$image}" alt="{$company_name}" border="0" style="border: 0px none;border-color: ;border-style: none;border-width: 0px;height: 102px;width: 587px;margin: 0;padding: 0;line-height: 100%;outline: none;text-decoration: none;" width="587" height="102">
                                                 </td>
                                             </tr>
                                         </table>
@@ -426,7 +426,7 @@ body,#bodyTable{
                                                         {block name="image-header"}
                                                         <tr>
                                                             <td class="bodyContent" style="padding-bottom: 20px;mso-table-lspace: 0pt;mso-table-rspace: 0pt;color: #505050;font-family: Helvetica;font-size: 16px;line-height: 150%;padding-top: 20px;text-align: left;border-collapse: collapse !important;">
-                                                                <img class="bodyImage" src="{image file='assets/img/header.jpg'}" alt="" border="0" style="border: 0px none;border-color: ;border-style: none;border-width: 0px;height: 188px;width: 580px;margin: 0;padding: 0;line-height: 100%;outline: none;text-decoration: none;display: inline;max-width: 600px;" width="580" height="188">
+                                                                <img class="bodyImage" src="{image file='assets/img/banniere_5x106.jpg'}" alt="" border="0" style="border: 0px none;border-color: ;border-style: none;border-width: 0px;margin: 0;padding: 0;line-height: 100%;outline: none;text-decoration: none;display: inline;max-width: 600px;" width="758" height="180">
                                                             </td>
                                                         </tr>
                                                         {/block}

templates/frontOffice/boutique/assets/src/css/thelia.css

@@ -8859,8 +8859,7 @@ header .header .language-container .currency-switch .select {
   min-width: 80px;
 }
 .footer-container .footer-banner {
-  background-color: #f49a17;
-  color: #fff;
+  background-color: #e8e8e8;
   font-size: 19px;
 }
 .footer-container .footer-banner .banner i {
@@ -9058,7 +9057,7 @@ a {
 }
 .btn {
   transition: all 0.3s ease-in-out;
-  border-radius: 12px;
+  border-radius: 0px;
   text-align: left;
   font-weight: 600;
 }
@@ -9073,6 +9072,7 @@ a {
 }
 .btn-primary {
   font-style: italic;
+  border-left: 3px solid #f9c478;
   text-align: center;
 }
 .btn-primary:hover,
@@ -9248,9 +9248,6 @@ a {
 .navbar.navbar-secondary {
   z-index: 1001;
 }
-.navbar.nav-main {
-  border-radius: 30px;
-}
 @media (min-width: 992px) {
   .navbar .list-subnav {
     background-color: #FFEDD8;
@@ -11028,7 +11025,21 @@ div > .rouge {
 .navbar li > a.login:before {
   color: white;
 }
-/* -----------------------  Footer  ----------------------- */
 .footer-container {
   margin-top: 50px;
 }
+.footer-container .footer-banner {
+  background-color: #f49a17;
+  color: #fff;
+}
+.btn {
+  border-radius: 12px;
+}
+.btn-primary {
+  border-left: 0px;
+}
+@media screen and (min-width: 768px) {
+  .navbar.nav-main {
+    border-radius: 30px;
+  }
+}

templates/frontOffice/boutique/assets/src/less/custom.less

@@ -33,7 +33,27 @@ div > .rouge {
   color: white;
 }
 
-/* -----------------------  Footer  ----------------------- */
 .footer-container {
   margin-top: 50px;
+
+  .footer-banner {
+    background-color: @brand-primary; //@footer-banner-bg;
+    color: #fff;
+  }
+}
+
+.btn {
+  border-radius: 12px;
+}
+
+.btn-primary {
+  border-left: 0px;
+}
+
+@media screen and (min-width: @screen-sm-min) {
+  .navbar {
+    &.nav-main {
+      border-radius: 30px;
+    }
+  }
 }

templates/frontOffice/boutique/assets/src/less/theme/buttons.less

@@ -1,7 +1,7 @@
 // Thelia : Buttons
 .btn {
     .transition(all 0.3s ease-in-out);
-    border-radius: 12px;
+    border-radius: 0px;
     text-align: left;
     font-weight: 600;
 
@@ -17,7 +17,7 @@
 
 .btn-primary {
     font-style: italic;
-    //border-left: 3px solid lighten(@brand-primary, 20%);
+    border-left: 3px solid lighten(@brand-primary, 20%);
     text-align: center;
 
     &:hover,

templates/frontOffice/boutique/assets/src/less/theme/footer.less

@@ -3,8 +3,7 @@
 
     // footer-banner
     .footer-banner {
-        background-color: @brand-primary ;//@footer-banner-bg;
-        color: #fff;
+        background-color: @footer-banner-bg;
         font-size: ceil(@font-size-base * 1.3);
         .banner {
             i {

templates/frontOffice/boutique/assets/src/less/theme/navbar.less

@@ -4,10 +4,6 @@
         z-index: 1001;
     }
 
-    &.nav-main {
-        border-radius: 30px;
-    }
-
     // Subnav Links
     @media (min-width: @grid-float-breakpoint) {
         .list-subnav {