From: soufiane <soufiane@cubedesigners.com>
Date: Mon, 13 May 2024 10:29:11 +0000 (+0200)
Subject: wait #6885 @1:30
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=4046c044ef1968c236d68a8fdf38f65f6d18f80c;p=fluidbook-toolbox-quiz.git

wait #6885 @1:30
---

diff --git a/js/quiz.screens.js b/js/quiz.screens.js
index 390f4cd..f4ebba5 100644
--- a/js/quiz.screens.js
+++ b/js/quiz.screens.js
@@ -27,8 +27,11 @@ QuizScreens.prototype = {
     initEvents: function () {
         const $this = this;
 
+        let standardColor = $this.quiz.data.theme.standardColor ? $this.quiz.data.theme.standardColor : $this.quiz.data.theme.neutralColor
+        let matchColor = $this.quiz.data.theme.matchColor ? $this.quiz.data.theme.matchColor : $this.quiz.data.theme.neutralColor
+        document.documentElement.style.setProperty("--match-color", matchColor)
         // enabled click on item
-        $(".list-item").css("pointer-events","auto")
+        $(".list-item").css("pointer-events","auto").find('label').css("background-color",standardColor)
 
         // Réinitialiser les réponses
         $(document).on("click", ".btn.reset", function () {
diff --git a/style/100-global.sass b/style/100-global.sass
index 6a90056..1ed8647 100644
--- a/style/100-global.sass
+++ b/style/100-global.sass
@@ -292,7 +292,6 @@ body
         width: 100%
         height: 100%
 
-
     &[data-bg-fit="cover"]
         img
             object-fit: cover
diff --git a/style/107-question-match.sass b/style/107-question-match.sass
index c08cd06..9b9852e 100644
--- a/style/107-question-match.sass
+++ b/style/107-question-match.sass
@@ -33,7 +33,7 @@
             &:after
                 height: 0
                 width: 0
-                border-top: 16px solid $neutral-color
+                border-top: 16px solid var(--match-color)
                 border-right: 21px solid transparent
                 border-left: 21px solid transparent
                 content: ""
@@ -49,7 +49,7 @@
             +radius(16px)
             //border: 1px solid rgb($texts-color, .24)
             text-align: center
-            background-color: $neutral-color
+            background-color: var(--match-color) !important
             font-size: 20px
 
     .bottom-slider
@@ -69,7 +69,7 @@
             transition: background-color $transition-time, border $transition-time
             border: 2px solid transparent
             transform-origin: 50% 50%
-            +opacity(.24, background-color, $neutral-color)
+            +opacity(.24, background-color, var(--match-color))
             opacity: 0
             text-align: center
 
@@ -77,7 +77,7 @@
                 transition: background-color $transition-time, border $transition-time, opacity $transition-time, transform $transition-time
 
             &-active
-                background-color: $neutral-color
+                background-color: var(--match-color)
                 border: 2px solid $texts-color
                 top: 0 !important
 
diff --git a/views/components/background.blade.php b/views/components/background.blade.php
index df897fb..ba77353 100644
--- a/views/components/background.blade.php
+++ b/views/components/background.blade.php
@@ -5,5 +5,7 @@
     }else{
         $m=false;
     }
+
+    $introColor = $data['theme']['introColor'] ?? $data['theme']['neutralColor'];
 @endphp
-<div data-bg-type="{{$name}}" data-bg-fit="{{$fit}}" data-bg="" data-bg-d="{{$d}}" @if($m)data-bg-m="{{$m}}"@endif></div>
+<div data-bg-type="{{$name}}" data-bg-fit="{{$fit}}" data-bg="" data-bg-d="{{$d}}" @if($m)data-bg-m="{{$m}}"@endif style="background-color: {{$introColor}};"></div>
diff --git a/views/screens/question_draganddrop.blade.php b/views/screens/question_draganddrop.blade.php
index b5da27e..78339f4 100644
--- a/views/screens/question_draganddrop.blade.php
+++ b/views/screens/question_draganddrop.blade.php
@@ -10,9 +10,10 @@
             <ul class="list">
                 @php
                     $keys = array_keys($question['answers']);
+                    $dragColor = $data['theme']['draganddropColor'] ?? $data['theme']['neutralColor']
                 @endphp
                 @foreach($question['answers'] as $index => $c)
-                    <li class="list-item {{ $index === 0 ? 'current' : '' }}" data-id="{{$index}}">
+                    <li class="list-item {{ $index === 0 ? 'current' : '' }}" data-id="{{$index}}" style="background-color: {{$dragColor}}">
                         <h4>{{$c['answer']}}</h4>
                         <p>{{$c['answer_text']}}</p>
                     </li>
diff --git a/views/screens/question_match.blade.php b/views/screens/question_match.blade.php
index f3dc49f..5ab8338 100644
--- a/views/screens/question_match.blade.php
+++ b/views/screens/question_match.blade.php
@@ -18,7 +18,7 @@
     @include('header_question', ['data' => $data, 'max' => $max, 'position' => $position])
     <div class="screen">
 
-        <div class="top-slider-container">
+        <div class="top-slider-container" data-bg="{{$data['theme']['matchColor']}}">
             @include('screens.arrow',['side'=>'left','action'=>'move-slide'])
             <div class="swiper-container top-slider">
                 <div class="swiper-pagination-top"></div>