wait #6122 @0:20

diff --git a/app/Models/Client.php b/app/Models/Client.php
index b1b20255d072e9f6e3e2b61488abb7e8b4a15af5..610f3246aca430fd394b9bebc2ce4232b62dc560 100644 (file)
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -84,7 +84,7 @@ class Client extends CubistMagicAbstractModel
         ]);
 
         $this->addField(['name' => 'discount',
-            'label' => 'Remise',
+            'label' => 'Code discount',
             'type' => 'select_from_array',
             'options' => ['A' => 'A','B' => 'B','C' => 'C','D' => 'D','E' => 'E'],
             'allows_null' => false,

diff --git a/resources/styles/components/products.styl b/resources/styles/components/products.styl
index 56b4187c5e72828365e38121f6c8a251cd6ff299..7d231648ce47fdd43c63f86ce8b180027b5c95a1 100644 (file)
--- a/resources/styles/components/products.styl
+++ b/resources/styles/components/products.styl
@@ -153,10 +153,6 @@
       height: 21px
       overflow: hidden
 
-.product-description-container
-  h3
-    font-weight 500
-
 .product-img-holder
   @apply bg-white relative pb-100p
 
@@ -183,9 +179,9 @@
   .product-highlights
     font-size 15px
   .product-description-container
-    *
-      font-family: 'Barlow', Sans-Serif
     h3
-      font-weight: 700
+      font-weight 700
+  .label
+    font-weight 500
   .price
     font-weight 600

diff --git a/resources/views/partials/product-link.blade.php b/resources/views/partials/product-link.blade.php
index 8443fb70b1323ccf7f6a570887ea9c0ffc1f762d..2fcd9c3583dbe685587177dda6c27aea8ba40776 100644 (file)
--- a/resources/views/partials/product-link.blade.php
+++ b/resources/views/partials/product-link.blade.php
@@ -23,7 +23,7 @@
     </a><!--
     There shoulln't be any space between closing of a and opening of div
     {{-- Product details --}}
-    --><div class="product-content p-4 text-navy">
+    --><div class="product-content p-4 text-navy font-display">
         <div class="product-container">
             <div class="product-description-container">
                 <h3><a class="text-navy" href="{{ $product->getEntity()->URL }}">{{ $product->get('reference') }}</a>
@@ -35,10 +35,10 @@
             <div class="product-price-info">
                 @if($product->basic_selling_price && $product->json)
                     @php($options = true)
-                    <p class="no-m text-sm mt-5">{{ __('Produit configurable') }}</p>
+                    <p class="no-m text-sm mt-5 label">{{ __('Produit configurable') }}</p>
                     <p class="price">{{ __('A partir de :').' '. $price }}€ HT</p>
                 @elseif($product->basic_selling_price && !$product->json)
-                    <p class="no-m line-through text-sm mt-5">{{ __('Prix catalogue :').' '.$product->basic_selling_price }}€ HT</p>
+                    <p class="no-m line-through text-sm mt-5 label">{{ __('Prix catalogue :').' '.$product->basic_selling_price }}€ HT</p>
                     <p class="price">{{ __('Votre prix :').' '. $price }}€ HT</p>
                 @endif
             </div>