fix: after merge develop

stardustmeg · Jun 3, 2024 · 4f6f691 · 4f6f691
1 parent 70ecbb2
commit 4f6f691
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 26 deletions.
diff --git a/.validate-branch-namerc.cjs b/.validate-branch-namerc.cjs
@@ -1,5 +1,6 @@
 module.exports = {
-  pattern: /^(feat|fix|hotfix|chore|refactor|revert|docs|style|test|)\(RSS-ECOMM-\d_\d{2}\)\/[a-z]+[a-zA-Z0-9]*$/,
+  pattern:
+    /^sprint-4|^(feat|fix|hotfix|chore|refactor|revert|docs|style|test|)\(RSS-ECOMM-\d_\d{2}\)\/[a-z]+[a-zA-Z0-9]*$/,
   errorMsg: 'Please use correct branch name',
 };
 

diff --git a/src/entities/ProductCard/view/productCardView.module.scss b/src/entities/ProductCard/view/productCardView.module.scss
@@ -4,7 +4,7 @@
   flex-direction: column;
   align-items: center;
   justify-self: center;
-  outline: var(--two) solid var(--noble-gray-300);
+  outline: calc(var(--one) * 1.5) solid var(--noble-gray-300);
   border-radius: var(--medium-br);
   min-height: calc(var(--extra-small-offset) * 17.5); // 350px
   max-width: calc(var(--extra-large-offset) * 2.5); // 250px
@@ -16,7 +16,7 @@
 
   @media (hover: hover) {
     &:hover {
-      outline: var(--two) solid var(--steam-green-800);
+      outline: calc(var(--one) * 1.5) solid var(--steam-green-800);
       transform: scale(0.98);
     }
   }
@@ -71,12 +71,12 @@
 .switchToWishListButton,
 .goDetailsPageLink {
   position: relative;
-  outline: var(--two) solid var(--noble-gray-700);
+  outline: calc(var(--one) * 1.5) solid var(--noble-gray-700);
   border-radius: var(--medium-br);
   padding: var(--tiny-offset);
   width: var(--small-offset);
   height: var(--small-offset);
-  background-color: var(--noble-gray-1000);
+  background-color: var(--white-tr);
   transition: outline 0.2s;
   backdrop-filter: blur(10px);
 
@@ -96,7 +96,7 @@
 .goDetailsPageLink {
   @media (hover: hover) {
     &:hover {
-      outline: var(--two) solid var(--steam-green-400);
+      outline: calc(var(--one) * 1.5) solid var(--steam-green-400);
 
       svg {
         fill: var(--steam-green-400);
@@ -113,7 +113,7 @@
 }
 
 .inWishList {
-  outline: var(--two) solid var(--red-power-600);
+  outline: calc(var(--one) * 1.5) solid var(--red-power-600);
 
   svg {
     fill: var(--red-power-600);
@@ -123,7 +123,7 @@
 .switchToWishListButton {
   @media (hover: hover) {
     &:hover {
-      outline: var(--two) solid var(--red-power-600);
+      outline: calc(var(--one) * 1.5) solid var(--red-power-600);
 
       svg {
         fill: var(--red-power-600);
@@ -134,7 +134,7 @@
   &.inWishList {
     @media (hover: hover) {
       &:hover {
-        outline: var(--two) solid var(--noble-gray-700);
+        outline: calc(var(--one) * 1.5) solid var(--noble-gray-700);
 
         svg {
           fill: var(--noble-gray-700);
@@ -174,7 +174,7 @@
   letter-spacing: var(--one);
   text-align: left;
   text-overflow: ellipsis;
-  color: var(--noble-gray-400);
+  color: var(--noble-gray-700);
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
 
@@ -220,7 +220,7 @@
   letter-spacing: var(--one);
   text-align: center;
   text-transform: uppercase;
-  color: var(--steam-green-400);
+  color: var(--steam-green-1100);
   background-color: var(--steam-green-800);
   gap: var(--two);
 }
diff --git a/src/entities/ProductModalSlider/view/productModalSliderView.module.scss b/src/entities/ProductModalSlider/view/productModalSliderView.module.scss
@@ -78,8 +78,9 @@
 
 .nextSlideButton,
 .prevSlideButton {
-  position: relative;
-  display: block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   border: var(--one) solid var(--noble-gray-200);
   border-radius: 50%;
   width: 3rem;
@@ -92,10 +93,21 @@
     border-color 0.2s,
     transform 0.2s;
 
+  svg {
+    width: 2.5rem;
+    height: 2.5rem;
+    stroke: var(--steam-green-800);
+    transition: stroke 0.2s;
+  }
+
   @media (hover: hover) {
     &:hover {
       border-color: var(--steam-green-400);
       color: var(--steam-green-700);
+
+      svg {
+        stroke: var(--steam-green-1100);
+      }
     }
   }
 
@@ -106,22 +118,14 @@
 }
 
 .nextSlideButton {
-  &::after {
-    content: '↑';
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%) rotate(90deg);
+  svg {
+    transform: rotate(90deg);
   }
 }
 
 .prevSlideButton {
-  &::after {
-    content: '↑';
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%) rotate(-90deg);
+  svg {
+    transform: rotate(-90deg);
   }
 }
 

diff --git a/src/shared/Modal/view/modalView.module.scss b/src/shared/Modal/view/modalView.module.scss
@@ -2,7 +2,7 @@
   position: fixed;
   left: 0;
   top: 0;
-  z-index: 1;
+  z-index: 2;
   width: 100%;
   height: 100%;
   opacity: 1;