wait #6122 @1:00 revue mise en forme

diff --git a/resources/styles/common/global.styl b/resources/styles/common/global.styl
index 8c0b13ebd9846460d83e2ee3bdc8b5b9918fac32..0745b9979881f9013185928f602bbb62b4447c1a 100644 (file)
--- a/resources/styles/common/global.styl
+++ b/resources/styles/common/global.styl
@@ -50,6 +50,9 @@ $overlap-amount = 10vw
       constrain(margin-bottom, -5vw)
       z-index: 10
 
+.text-medium
+  font-weight: 500
+
 // Image overlay: radial gradient to provide better readability for overlapping text
 .image-overlay-radial
   position: relative

diff --git a/resources/styles/components/products.styl b/resources/styles/components/products.styl
index b18c90d759482d77cb787d7d4b71a4b2941a7196..56b4187c5e72828365e38121f6c8a251cd6ff299 100644 (file)
--- a/resources/styles/components/products.styl
+++ b/resources/styles/components/products.styl
@@ -153,6 +153,9 @@
       height: 21px
       overflow: hidden
 
+.product-description-container
+  h3
+    font-weight 500
 
 .product-img-holder
   @apply bg-white relative pb-100p
@@ -175,3 +178,14 @@
       .no-objectfit & {
         height auto
       }
+
+.product-category
+  .product-highlights
+    font-size 15px
+  .product-description-container
+    *
+      font-family: 'Barlow', Sans-Serif
+    h3
+      font-weight: 700
+  .price
+    font-weight 600

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index f0c869bfad2fbdabf6f8fa15234dd98edc877bbc..220aec7fb72fa26f254ae14d4ed475b44a62d45c 100644 (file)
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -9,7 +9,7 @@
         <link href="{{ mix('css/app.css') }}" rel="stylesheet">
     @endif
 
-    <link href="https://fonts.googleapis.com/css?family=Barlow:400,500,600|Muli:400,700&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Barlow:400,500,600,700|Muli:400,700&display=swap" rel="stylesheet">
 @endprepend
 
 @prepend('scripts')

diff --git a/resources/views/pages/category.blade.php b/resources/views/pages/category.blade.php
index 201a937b784f398dd8818e27d08c2c1ab42aa786..e5ec9c26e59bcb2fc4b1a83b307f586997abe7b2 100644 (file)
--- a/resources/views/pages/category.blade.php
+++ b/resources/views/pages/category.blade.php
@@ -6,7 +6,7 @@
 
     <full-width class="bg-grey-100" padding="pt-1v pb-2v">
 
-        <content>
+        <content class="product-category">
 
             @if ($filters && $filter_results)
                 <products-filters v-cloak

diff --git a/resources/views/pages/product-detail.blade.php b/resources/views/pages/product-detail.blade.php
index 2f63521d3a9d90f8484940d6165fbcb1a7a6795b..87378aeed89b3c3745785fd36298684bc0ce4e11 100644 (file)
--- a/resources/views/pages/product-detail.blade.php
+++ b/resources/views/pages/product-detail.blade.php
@@ -25,7 +25,7 @@
     <content class="pt-1v">
         <text-block title-tag="h1" :title="$product->name">
             <slot name="preTitle">
-                <div class="text-navy text-bold font-display text-xl -mb-2">Ref: {{ $product->reference }}</div>
+                <div class="text-navy text-medium font-display text-xl mb-2">Ref: {{ $product->reference }}</div>
             </slot>
         </text-block>
 
@@ -207,8 +207,7 @@
 
     @if (count($related) > 0)
         <full-width class="bg-grey-100">
-            <content>
-
+            <content class="product-associated">
                 <text-block :title="__('Produits associés')" title-class="h2"/>
 
                 {{-- Product Grid --}}

diff --git a/resources/views/partials/product-link.blade.php b/resources/views/partials/product-link.blade.php
index a58550d31d241aadc4f95dd5262f06990bf1591e..8443fb70b1323ccf7f6a570887ea9c0ffc1f762d 100644 (file)
--- a/resources/views/partials/product-link.blade.php
+++ b/resources/views/partials/product-link.blade.php
@@ -36,10 +36,10 @@
                 @if($product->basic_selling_price && $product->json)
                     @php($options = true)
                     <p class="no-m text-sm mt-5">{{ __('Produit configurable') }}</p>
-                    <p>{{ __('A partir de :').' '. $price }}€ HT</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>{{ __('Votre prix :').' '. $price }}€ HT</p>
+                    <p class="price">{{ __('Votre prix :').' '. $price }}€ HT</p>
                 @endif
             </div>
         </div>