wait #7589 @1.5

diff --git a/js/quiz.match.js b/js/quiz.match.js
index 7b21b0277d026130f334498ee07522828e0242b4..74e23283763c5968441125f6dd3dcc300eb62d5a 100644 (file)
--- a/js/quiz.match.js
+++ b/js/quiz.match.js
@@ -87,8 +87,16 @@ QuizMatch.prototype = {
         let slidesNext = this.swiperBottomEl.find(".swiper-slide-active").nextAll()
         let slidesPrev = this.swiperBottomEl.find(".swiper-slide-active").prevAll()
         let slideActive = this.swiperBottomEl.find(".swiper-slide-active")
-        const rules = {
-            opacity: function (index) {
+        let rules = {
+            ease: "power1.inOut",
+            stagger: .15,
+            onComplete: function () {
+                $(this.target).removeClass("not-visible")
+            }
+        }
+
+        if (this.quiz.data.theme.matchOtherOpacity < 100) {
+            rules.opacity = function (index) {
                 let opacity = 0
                 if (index === 0) {
                     opacity = 0.8
@@ -98,13 +106,11 @@ QuizMatch.prototype = {
                     opacity = 0.4
                 }
                 return opacity
-            },
-            ease: "power1.inOut",
-            stagger: .15,
-            onComplete: function () {
-                $(this.target).removeClass("not-visible")
-            }
+            };
+        } else {
+            rules.opacity = 1;
         }
+
         this.timeline = gsap.timeline({delay: .5})
 
         this.timeline.to(".active-screen .top-slider-container", {
@@ -143,7 +149,7 @@ QuizMatch.prototype = {
         let abspos = Math.abs(position);
 
         let angle = (position * 4);
-        let opacity = 1 - (abspos * 0.2);
+        let opacity = this.quiz.data.theme.matchOtherOpacity == 100 ? 1 : 1 - (abspos * 0.2);
         let floorpos = Math.floor(abspos)
         let ceilpos = Math.ceil(abspos);
         let top = tops[floorpos];

diff --git a/style/107-question-match.sass b/style/107-question-match.sass
index 322b1582513fbbd4d5d8a36d9485750e173598c0..6faf73a661bbdbe65ad37c6e8690c7040f18ee6f 100644 (file)
--- a/style/107-question-match.sass
+++ b/style/107-question-match.sass
@@ -30,6 +30,7 @@
 
         &-container
             position: relative
+
             &:after
                 height: 0
                 width: 0
@@ -70,7 +71,7 @@
             transition: background-color $transition-time, border $transition-time
             border: 2px solid transparent
             transform-origin: 50% 50%
-            +opacity(.24, background-color, var(--match-color))
+            +opacity($card-disabled-opacity, background-color, var(--match-color))
             opacity: 0
             text-align: center
 
@@ -79,7 +80,7 @@
 
             &-active
                 background-color: var(--match-color)
-                border: 2px solid $texts-color
+                border: 2px solid $active-stroke-color
                 top: 0 !important
 
                 &:not(.not-visible)
@@ -87,11 +88,11 @@
 
             &-prev,
             &-next
-                +opacity(.24, background-color, $card-disabled-background)
+                +opacity($card-disabled-opacity, background-color, $card-disabled-background)
                 color: $card-disabled-color
 
             &:not(.swiper-slide-active):not(.swiper-slide-prev):not(.swiper-slide-next)
-                +opacity(.24, background-color, $card-disabled-background)
+                +opacity($card-disabled-opacity, background-color, $card-disabled-background)
                 color: $card-disabled-color