wait #7526 @0.5

diff --git a/js/quiz.screen.outro.js b/js/quiz.screen.outro.js
index 80f44f0990e8872a88b052c32ed2aef0f60cdf38..9739c193b7481a98de372c8e1a5e06bc6861959f 100644 (file)
--- a/js/quiz.screen.outro.js
+++ b/js/quiz.screen.outro.js
@@ -221,7 +221,7 @@ QuizScreenOutro.prototype = {
 
         reviewList = reviewList.map((c, i) => {
             return {
-                'question': c['question'],
+                'question': c['question_html'],
                 'type': c['type'],
                 'correctAnswers': c['answers'].filter((c__,k) => { //on filtre les réponses
                     let status_ = c['answers']

diff --git a/style/100-global.sass b/style/100-global.sass
index ea1aa71072466deaac9aea86a4d781f9a4e6cf78..0bb2f1c36316eb407577ad8b0884a61d8660261c 100644 (file)
--- a/style/100-global.sass
+++ b/style/100-global.sass
@@ -18,6 +18,15 @@ a
     text-decoration: none
     color: $texts-color
 
+strong
+    font-weight: bold
+
+em
+    font-style: italic
+
+p
+    white-space: pre-line
+
 #quiz
     opacity: 0
     transition: opacity 200ms

diff --git a/style/101-header-footer.sass b/style/101-header-footer.sass
index 812418462cb3a5f03a242a7b5d787652125a25d5..ebdb1d7939700f9d25fb2153514d7e6a8ab5df61 100644 (file)
--- a/style/101-header-footer.sass
+++ b/style/101-header-footer.sass
@@ -49,14 +49,6 @@ header
         &.nok
             background-color: $nok-color
 
-    #titleQuestion
-        p
-            white-space: pre-line
-            strong
-                font-weight: 700
-            em
-                font-style: italic
-
     h1
         height: auto
         +font-size(24)

diff --git a/style/102-intro.sass b/style/102-intro.sass
index dbc0543de26f6ca5a5fdcf11ab61636638e9c5ce..ca962e5f4af0aa71a199a845588fb81806c2fa50 100644 (file)
--- a/style/102-intro.sass
+++ b/style/102-intro.sass
@@ -19,6 +19,8 @@
                 font-weight: 600
                 line-height: 48px
 
+
+
 #welcome
     max-width: 590px
     margin: 0 auto
@@ -33,11 +35,7 @@
         +font-size(16)
         clip-path: polygon(0 0, 100% 0, 100% 100%, 0% 100%)
 
-        strong
-            font-weight: bold
 
-        em
-            font-style: italic
 
         a
             text-decoration: underline

diff --git a/views/header_question.blade.php b/views/header_question.blade.php
index 094b79af998f4d75b5b1c75f27b0dd16f0f8b7f9..280ae40bf86431c3ac1914b1bb06a831625f9b19 100644 (file)
--- a/views/header_question.blade.php
+++ b/views/header_question.blade.php
@@ -23,17 +23,17 @@
     @if($question['type'] === "draganddrop")
         <h1 class="{{$h1class}}" id="titleQuestion">
             <span
-                class="only-desktop">{!! $markdownToHTML($question['question']) !!}</span>
-            <span class="only-mobile">{{$__('Swipe up or down each card in the right container')}}{{__(': ')}}<br>{!! $markdownToHTML($question['question']) !!}</span>
+                class="only-desktop">{!! $question['question_html'] !!}</span>
+            <span class="only-mobile">{{$__('Swipe up or down each card in the right container')}}{{__(': ')}}<br>{!! $question['question_html'] !!}</span>
         </h1>
         <h2 class="subtitle only-desktop">{{$__('Use arrow keys to move the cards to the corresponding zone')}}</h2>
     @elseif($question['type']==='match')
         <h1 id="titleQuestion">
-            {!! $markdownToHTML($question['question']) !!}
+            {!! $question['question_html'] !!}
         </h1>
         <h2 class="subtitle"
             class="only-desktop">{{$__('When you feel the answer is appropriate, confirm the match to move on to the next question')}}</h2>
     @else
-        <h1 class="{{$h1class}}" id="titleQuestion">{!! $markdownToHTML($question['question']) !!}</h1>
+        <h1 class="{{$h1class}}" id="titleQuestion">{!! $question['question_html'] !!}</h1>
     @endif
 </header>