From b87612a577ce85934f58b267a07667dbf23be818 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Jun 2021 13:42:29 +0200
Subject: [PATCH 1/3] MOBILE-3320 quiz: Fix invalid parameter after finishing
 quiz

---
 src/addons/mod/quiz/components/index/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/addons/mod/quiz/components/index/index.ts b/src/addons/mod/quiz/components/index/index.ts
index d31293695..623de1c11 100644
--- a/src/addons/mod/quiz/components/index/index.ts
+++ b/src/addons/mod/quiz/components/index/index.ts
@@ -647,7 +647,9 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
 
             if (data) {
                 this.gradebookData = {
-                    grade: 'graderaw' in data ? data.graderaw : Number(data.grade),
+                    grade: 'graderaw' in data && data.graderaw !== undefined && data.graderaw !== null ?
+                        data.graderaw :
+                        (data.grade !== undefined && data.grade !== null ? Number(data.grade) : undefined),
                     feedback: data.feedback,
                 };
             }

From 67ad72b425eaa22aa0ac48cac8b79e084aff1ced Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Jun 2021 15:19:24 +0200
Subject: [PATCH 2/3] MOBILE-3320 format-text: Fix bullets and numbers cutoff
 in lists

---
 src/theme/components/format-text.scss | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss
index b942d188d..b0543d50b 100644
--- a/src/theme/components/format-text.scss
+++ b/src/theme/components/format-text.scss
@@ -209,9 +209,7 @@ core-format-text {
 core-format-text {
     ul {
         padding-left: 1rem;
-    }
-    ul, ol {
-        -webkit-padding-start: 15px;
+        -webkit-margin-start: .2rem;
     }
 
     .atto_image_button_text-top,

From 9dde9de784e24178c22d31986ffe3e031705c203 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Jun 2021 16:14:57 +0200
Subject: [PATCH 3/3] MOBILE-3320 quiz: Fix wrong element highlighted in D&D
 questions

---
 .../component/addon-qtype-ddimageortext.html  | 12 +++---
 .../component/addon-qtype-ddmarker.html       | 12 +++---
 .../ddwtos/component/addon-qtype-ddwtos.html  | 38 +++++++++----------
 3 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html b/src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
index ff3cb646f..ff872fb90 100644
--- a/src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
+++ b/src/addons/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
@@ -17,11 +17,9 @@
             </core-format-text>
         </ion-label>
     </ion-item>
-    <ion-item class="ion-text-wrap" [hidden]="!ddQuestion.loaded">
-        <ion-label>
-            <core-format-text *ngIf="ddQuestion.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId"
-                [text]="ddQuestion.ddArea" [filter]="false" (afterRender)="ddAreaRendered()">
-            </core-format-text>
-        </ion-label>
-    </ion-item>
+    <div class="fake-ion-item ion-text-wrap" [hidden]="!ddQuestion.loaded">
+        <core-format-text *ngIf="ddQuestion.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId"
+            [text]="ddQuestion.ddArea" [filter]="false" (afterRender)="ddAreaRendered()">
+        </core-format-text>
+    </div>
 </div>
diff --git a/src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html b/src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html
index 39a60a78d..c4d1bae1b 100644
--- a/src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html
+++ b/src/addons/qtype/ddmarker/component/addon-qtype-ddmarker.html
@@ -16,11 +16,9 @@
             </core-format-text>
         </ion-label>
     </ion-item>
-    <ion-item class="ion-text-wrap" [hidden]="!ddQuestion.loaded">
-        <ion-label>
-            <core-format-text *ngIf="ddQuestion.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId"
-                [text]="ddQuestion.ddArea" [filter]="false" (afterRender)="ddAreaRendered()">
-            </core-format-text>
-        </ion-label>
-    </ion-item>
+    <div class="fake-ion-item ion-text-wrap" [hidden]="!ddQuestion.loaded">
+        <core-format-text *ngIf="ddQuestion.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId"
+            [text]="ddQuestion.ddArea" [filter]="false" (afterRender)="ddAreaRendered()">
+        </core-format-text>
+    </div>
 </div>
diff --git a/src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html b/src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html
index 39222c454..1403f3d22 100644
--- a/src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html
+++ b/src/addons/qtype/ddwtos/component/addon-qtype-ddwtos.html
@@ -2,26 +2,24 @@
     <!-- Content is outside the core-loading to let the script calculate drag items position -->
     <core-loading [hideUntil]="ddQuestion.loaded"></core-loading>
 
-    <ion-item class="ion-text-wrap" [hidden]="!ddQuestion.loaded">
-        <ion-label>
-            <ion-card *ngIf="!ddQuestion.readOnly" class="core-info-card">
-                <ion-item>
-                    <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
-                    <ion-label>{{ 'core.question.howtodraganddrop' | translate }}</ion-label>
-                </ion-item>
-            </ion-card>
-            <div class="addon-qtype-ddwtos-container">
-                <core-format-text [component]="component" [componentId]="componentId" [text]="ddQuestion.text"
-                    [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" #questiontext
-                    (afterRender)="textRendered()">
-                </core-format-text>
+    <div class="fake-ion-item ion-text-wrap" [hidden]="!ddQuestion.loaded">
+        <ion-card *ngIf="!ddQuestion.readOnly" class="core-info-card">
+            <ion-item>
+                <ion-icon name="fas-info-circle" slot="start" aria-hidden="true"></ion-icon>
+                <ion-label>{{ 'core.question.howtodraganddrop' | translate }}</ion-label>
+            </ion-item>
+        </ion-card>
+        <div class="addon-qtype-ddwtos-container">
+            <core-format-text [component]="component" [componentId]="componentId" [text]="ddQuestion.text"
+                [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" #questiontext
+                (afterRender)="textRendered()">
+            </core-format-text>
 
-                <core-format-text *ngIf="ddQuestion.answers" [component]="component" [componentId]="componentId"
-                    [text]="ddQuestion.answers" [filter]="false" (afterRender)="answersRendered()">
-                </core-format-text>
+            <core-format-text *ngIf="ddQuestion.answers" [component]="component" [componentId]="componentId"
+                [text]="ddQuestion.answers" [filter]="false" (afterRender)="answersRendered()">
+            </core-format-text>
 
-                <div class="drags"></div>
-            </div>
-        </ion-label>
-    </ion-item>
+            <div class="drags"></div>
+        </div>
+    </div>
 </div>