Merge branch 'master' into CR/Pricelist

# Conflicts:
#	src/pages/shop/product/variant/[slug].jsx

1 files changed, 30 insertions, 14 deletions

diff --git a/src/styles/globals.css b/src/styles/globals.css
index 06ae7ca2..e3e0e48e 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -1,5 +1,3 @@
-@import url('https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap');
-
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
@@ -14,7 +12,8 @@ body {
         text-body-2
         text-gray_r-12
         bg-gray_r-1
-        overflow-x-clip;
+        overflow-x-clip
+        antialiased;
 }
 
 #__next main {
@@ -114,8 +113,8 @@ button {
             focus:border-danger-500;
     }
 
-    .form-input[type=file] {
-        @apply py-2
+    .form-input[type='file'] {
+        @apply py-2;
     }
 
     .btn-yellow,
@@ -401,7 +400,7 @@ button {
         w-full;
 }
 
-.table-specification > table > thead > tr > th:last-child{
+.table-specification > table > thead > tr > th:last-child {
     @apply w-3/12;
 }
 
@@ -463,7 +462,7 @@ button {
 .table-data {
     @apply w-full
     table-auto
-    border-collapse;;
+    border-collapse;
 }
 
 .table-data thead tr {
@@ -632,12 +631,29 @@ button {
 }
 
 @keyframes shake {
-    0% { transform: translateX(0); }
-    10%, 90% { transform: translateX(-10px); }
-    20%, 80% { transform: translateX(10px); }
-    30%, 50%, 70% { transform: translateX(-10px); }
-    40%, 60% { transform: translateX(10px); }
-    100% { transform: translateX(0); }
+    0% {
+        transform: translateX(0);
+    }
+    10%,
+    90% {
+        transform: translateX(-10px);
+    }
+    20%,
+    80% {
+        transform: translateX(10px);
+    }
+    30%,
+    50%,
+    70% {
+        transform: translateX(-10px);
+    }
+    40%,
+    60% {
+        transform: translateX(10px);
+    }
+    100% {
+        transform: translateX(0);
+    }
 }
 
 .blink-color-flash-sale {
@@ -656,4 +672,4 @@ button {
     to {
         @apply text-warning-500;
     }
-}
\ No newline at end of file
+}