From: Vincent Vanwaelscappel Date: Tue, 13 May 2025 14:28:30 +0000 (+0200) Subject: wait #7526 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3a5b982fbd549c170d68fdb19f440753ad99e6b0;p=fluidbook-toolbox-quiz.git wait #7526 @0.5 --- diff --git a/js/quiz.screen.outro.js b/js/quiz.screen.outro.js index 80f44f0..9739c19 100644 --- 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 ea1aa71..0bb2f1c 100644 --- 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 8124184..ebdb1d7 100644 --- 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 dbc0543..ca962e5 100644 --- 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 094b79a..280ae40 100644 --- a/views/header_question.blade.php +++ b/views/header_question.blade.php @@ -23,17 +23,17 @@ @if($question['type'] === "draganddrop")

{!! $markdownToHTML($question['question']) !!} - {{$__('Swipe up or down each card in the right container')}}{{__(': ')}}
{!! $markdownToHTML($question['question']) !!}
+ class="only-desktop">{!! $question['question_html'] !!} + {{$__('Swipe up or down each card in the right container')}}{{__(': ')}}
{!! $question['question_html'] !!}

{{$__('Use arrow keys to move the cards to the corresponding zone')}}

@elseif($question['type']==='match')

- {!! $markdownToHTML($question['question']) !!} + {!! $question['question_html'] !!}

{{$__('When you feel the answer is appropriate, confirm the match to move on to the next question')}}

@else -

{!! $markdownToHTML($question['question']) !!}

+

{!! $question['question_html'] !!}

@endif