Merge branch 'release' into development

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

1 files changed, 19 insertions, 1 deletions

diff --git a/src/styles/globals.css b/src/styles/globals.css
index bf9fec10..f6561b00 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -107,7 +107,7 @@ button {
             disabled:bg-gray_r-5;
     }
 
-    .form-input[aria-invalid="true"] {
+    .form-input[aria-invalid='true'] {
         @apply border-danger-500
             focus:border-danger-500;
     }
@@ -676,3 +676,21 @@ button {
         @apply text-warning-500;
     }
 }
+
+::-webkit-scrollbar {
+    width: 12px;
+}
+
+::-webkit-scrollbar-track {
+    background-color: transparent;
+}
+
+::-webkit-scrollbar-thumb {
+    background-color: #888;
+    border-radius: 6px;
+    border: 3px solid #f5f5f5;
+}
+
+::-webkit-scrollbar-thumb:hover {
+    background-color: #555;
+}