wait #5788 @1:40 qa + correction du responsive

diff --git a/resources/styles/components/cart.styl b/resources/styles/components/cart.styl
index 72189585ca9109057a3a7278f3783cdd2f7d49ae..70eee804b681b4baf57dd41224d4a46ab18e993a 100644 (file)
--- a/resources/styles/components/cart.styl
+++ b/resources/styles/components/cart.styl
@@ -79,6 +79,7 @@
     form
       label
         padding-left: 20px !important
+        width 100%
 
       [type="radio"]
         width: 16px !important
@@ -164,7 +165,8 @@
       margin-bottom: 24px
 
   &-grid
-    grid-template-columns: 96px 1fr !important
+    +above(767px)
+      grid-template-columns: 96px 1fr !important
 
   &-footer
     padding: 48px 0

diff --git a/resources/styles/components/modal-confirm.styl b/resources/styles/components/modal-confirm.styl
index 63c7bcecad10d06c5ed3bb077d62ea1089f2117f..e6686d93b96028b3178efa7e5db69db9d46638fe 100644 (file)
--- a/resources/styles/components/modal-confirm.styl
+++ b/resources/styles/components/modal-confirm.styl
@@ -28,6 +28,9 @@
   &-close
     top: 24px
     right: 24px
+    +below(768px)
+      top: 6px
+      right 15px
   &:after
     content: ""
     width: 100%

diff --git a/resources/views/components/item-cart-order.blade.php b/resources/views/components/item-cart-order.blade.php
index 5a63cf0325c3a545146707757ced77e72c1c98fa..3d381721887421cd5143072356286a50a5fdfd42 100644 (file)
--- a/resources/views/components/item-cart-order.blade.php
+++ b/resources/views/components/item-cart-order.blade.php
@@ -17,10 +17,10 @@
             @if($item['products'])
             @foreach(json_decode($item['products'], true) as $key => $product)
                 <grid gap="md" class="sm:grid-cols-1 cartsave-grid">
-                    <div class="product-thumbnail bg-center bg-contain bg-no-repeat"
+                    <div class="product-thumbnail sm:hidden bg-center bg-contain bg-no-repeat"
                          style='background-image : url("{{ $product['image'] }}")'>
                     </div>
-                    <div class="product-infos flex justify-between items-center">
+                    <div class="product-infos flex sm:flex-col justify-between sm:items-start items-center">
                         <div>
                             <p class="no-m">{{ $product['reference'].'|'.$product['ref'] }}</p>
                             <p class="no-m text-navy">{{ $product['name'] }}</p>
@@ -47,7 +47,10 @@
                         </div>
                         <div class="product-price">
                             @if(floatval($product['price']))
-                                <p class="no-m">{{ number_format($product['price'] * $product['quantity'], 2) }}€ HT</p>
+                                <p class="no-m">
+                                    <span class="sm:inline hidden">{{ __('Total HT : ') }}</span>
+                                    {{ number_format($product['price'] * $product['quantity'], 2) }}€ HT
+                                </p>
                             @else
                                 <p class="text-navy">
                                     N/A

diff --git a/resources/views/components/item-cart.blade.php b/resources/views/components/item-cart.blade.php
index 42e106da595975db3db9ea463f21613c8da6cca9..cba444bef9928339a3c8465181e96090815637a1 100644 (file)
--- a/resources/views/components/item-cart.blade.php
+++ b/resources/views/components/item-cart.blade.php
@@ -11,9 +11,9 @@
         <div class="cartsave-products">
             @foreach(json_decode($item['products'], true) as $key => $product)
                 <grid gap="md" class="sm:grid-cols-1 cartsave-grid">
-                    <div class="product-thumbnail bg-center bg-contain bg-no-repeat" style='background-image : url("{{ $product['image'] }}")'>
+                    <div class="product-thumbnail sm:hidden bg-center bg-contain bg-no-repeat" style='background-image : url("{{ $product['image'] }}")'>
                     </div>
-                    <div class="product-infos flex justify-between items-center">
+                    <div class="product-infos flex sm:flex-col justify-between sm:items-start items-center">
                         <div>
                             <p class="no-m">{{ $product['ref'] }}</p>
                             <p class="no-m text-navy">{{ $product['name'] }}</p>
@@ -40,7 +40,10 @@
                         <div class="product-price">
                             @if(floatval($product['price']))
                                 @php($price = $product['price'] - (($product['price'] * $product['discount']) / 100))
-                                <p class="no-m">{{ number_format($price * $product['quantity'], 2) }}€ HT</p>
+                                <p class="no-m">
+                                    <span class="sm:inline hidden">{{ __('Total HT : ') }}</span>
+                                    {{ number_format($price * $product['quantity'], 2) }}€ HT
+                                </p>
                             @else
                                 <p class="text-navy">
                                     N/A
@@ -63,20 +66,20 @@
                     </div>
                 @endif
             </div>
-            <div class="flex justify-between items-center">
+            <div class="flex sm:flex-col justify-between items-center">
                 <button class="flex items-center" data-id="{{ $item['id'] }}" @click.stop="removeSavedCart">
                     @svg('icon-trash')
                     <span class="ml-3">{{ __('Supprimer ce panier') }}</span>
                 </button>
 
-                <div class="flex items-center">
-                    <a href="#" data-id="{{ $item['id'] }}" class="animated-underline mr-10 xs:mr-0" @click.self.prevent="savedCartToCurrent">
+                <div class="flex sm:flex-col sm:mb-3 sm:order-first sm:w-full items-center">
+                    <a href="#" data-id="{{ $item['id'] }}" class="animated-underline sm:mb-3 mr-10 xs:mr-0" @click.self.prevent="savedCartToCurrent">
                         {{ __('Modifier ce panier') }}
                     </a>
                     @isset($item['total'])
-                        <a href="#" class="btn" data-to="ma-commande" data-id="{{ $item['id'] }}" @click.self.prevent="savedCartToCurrent">{{ __('Passer commande') }}</a>
+                        <a href="#" class="btn sm:w-full text-center" data-to="ma-commande" data-id="{{ $item['id'] }}" @click.self.prevent="savedCartToCurrent">{{ __('Passer commande') }}</a>
                     @else
-                        <a href="" class="btn" data-id="{{ $item['id'] }}" @click.self.prevent="savedCartToCurrent">{{ __('Demander un devis') }}</a>
+                        <a href="" class="btn sm:w-12/12" data-id="{{ $item['id'] }}" @click.self.prevent="savedCartToCurrent">{{ __('Demander un devis') }}</a>
                     @endisset
                 </div>
             </div>

diff --git a/resources/views/components/modal-confirm.blade.php b/resources/views/components/modal-confirm.blade.php
index d7c8257982126ac4c6cf970beca169c1d399da6c..2d3a29f986d5bd147a389291d3346ed4abe46681 100644 (file)
--- a/resources/views/components/modal-confirm.blade.php
+++ b/resources/views/components/modal-confirm.blade.php
@@ -1,7 +1,7 @@
 <div class="modal-confirm fixed top-0 left-0 flex items-center" v-cloak v-if="validateAction">
-    <div class="modal-confirm-text relative text-2xl bg-white p-24 text-center mx-auto" v-close-outside>
+    <div class="modal-confirm-text relative sm:text-lg text-2xl bg-white sm:p-6 p-24 text-center mx-auto" v-close-outside>
         <button class="modal-confirm-close absolute" @click.prevent="validateAction = false">
-            @svg('icon-close-thin', 'w-4')
+            @svg('icon-close-thin', 'sm:2 w-4')
         </button>
         {{ $slot }}
     </div>

diff --git a/resources/views/pages/order.blade.php b/resources/views/pages/order.blade.php
index 3911aafbce7bb52cb7e33155cd5c8a66df3d0850..5efe06cda2458dbffc09fa1ee553faf18646d92b 100644 (file)
--- a/resources/views/pages/order.blade.php
+++ b/resources/views/pages/order.blade.php
@@ -48,7 +48,7 @@
                     <div class="bg-grey-100 p-1v cart-addresses" v-cloak>
                         <h2 class="font-normal">{{ __('Choisir une adresse de facturation') }} :</h2>
                         <form class="mb-12">
-                            <div class="grid grid-cols-2 grid-gap-lg grid-rows-0 mb-3">
+                            <div class="grid sm:grid-cols-1 grid-cols-2 grid-gap-lg grid-rows-0 mb-3">
                                 <div class="bg-white p-3" v-for="address in addresses" :key="address.id">
                                     <div class="form-group flex items-start" :data="address.address_billing">
                                         <input :id="'billing_address-'+address.id" name="billing_address" type="radio" :checked="address.billing_address === '1' ? true : false"/>
@@ -70,7 +70,7 @@
                         </form>
                         <h2 class="font-normal">{{ __('Choisir une adresse de livraison') }} :</h2>
                         <form>
-                            <div class="grid grid-cols-2 grid-gap-lg grid-rows-0 mb-3">
+                            <div class="grid sm:grid-cols-1 grid-cols-2 grid-gap-lg grid-rows-0 mb-3">
                                 <div class="bg-white p-3" v-for="address in addresses" :key="address.id">
                                     <div class="form-group flex items-start" :data="address.address_billing">
                                         <input :id="'delivery_address-'+address.id" name="delivery_address" type="radio" :checked="address.delivery_address === '1' ? true : false"/>