From e0456102ee6977bc0f368b17ba7d32906abda588 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 2 Jul 2021 15:42:23 +0200
Subject: [PATCH 1/2] MOBILE-3320 forum: Fix nested replies not rendered

---
 src/addons/mod/forum/pages/discussion/discussion.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index b76be7a5a..9162073ee 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -129,7 +129,7 @@
                     (onPostChange)="postListChanged()">
                 </addon-mod-forum-post>
             </ion-card>
-            <div class="ion-padding-left" *ngIf="post.children.length && post.children[0].subject">
+            <div class="ion-padding-left" *ngIf="post.children && post.children.length && post.children[0].subject">
                 <ng-container *ngFor="let child of post.children">
                     <ng-container *ngTemplateOutlet="nestedPosts; context: {post: child}"></ng-container>
                 </ng-container>

From 93942215c6453202b62649f20afb34fda8534069 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 2 Jul 2021 15:51:16 +0200
Subject: [PATCH 2/2] MOBILE-3320 core: Fix wrong padding-left class

---
 src/addons/blog/pages/entries/entries.html                    | 4 ++--
 src/addons/mod/book/components/toc/toc.html                   | 2 +-
 src/addons/mod/forum/components/post/post.html                | 4 ++--
 src/addons/mod/forum/pages/discussion/discussion.html         | 2 +-
 src/addons/mod/imscp/components/toc/toc.html                  | 2 +-
 src/addons/notifications/pages/list/list.html                 | 2 +-
 .../features/rating/components/ratings/ratings-modal.html     | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html
index 9f4efbfec..ed95f9bfc 100644
--- a/src/addons/blog/pages/entries/entries.html
+++ b/src/addons/blog/pages/entries/entries.html
@@ -28,12 +28,12 @@
                             <core-format-text [text]="entry.subject" [contextLevel]="contextLevel"
                                 [contextInstanceId]="contextInstanceId">
                             </core-format-text>
-                            <ion-note class="ion-float-end ion-padding-left ion-text-end">
+                            <ion-note class="ion-float-end ion-padding-start ion-text-end">
                                 {{ 'addon.blog.' + entry.publishTranslated! | translate}}
                             </ion-note>
                         </p>
                         <p>
-                            <ion-note class="ion-float-end ion-padding-left ion-text-end">
+                            <ion-note class="ion-float-end ion-padding-start ion-text-end">
                                 {{entry.created | coreDateDayOrTime}}
                             </ion-note>
                             {{entry.user && entry.user!.fullname}}
diff --git a/src/addons/mod/book/components/toc/toc.html b/src/addons/mod/book/components/toc/toc.html
index 7c7432906..7028b51d4 100644
--- a/src/addons/mod/book/components/toc/toc.html
+++ b/src/addons/mod/book/components/toc/toc.html
@@ -15,7 +15,7 @@
                 [attr.aria-current]="selected == chapter.id ? 'page' : 'false'" button
                 [class.item-dimmed]="chapter.hidden" detail="false">
                 <ion-label>
-                    <p [class.ion-padding-left]="addPadding && chapter.level == 1 ? true : null" class="item-heading">
+                    <p [class.ion-padding-start]="addPadding && chapter.level == 1 ? true : null" class="item-heading">
                         <span *ngIf="showNumbers" class="addon-mod-book-number">{{chapter.indexNumber}}&nbsp;</span>
                         <span *ngIf="showBullets" class="addon-mod-book-bullet">&bull;&nbsp;</span>
                         <core-format-text [text]="chapter.title" contextLevel="module" [contextInstanceId]="moduleId"
diff --git a/src/addons/mod/forum/components/post/post.html b/src/addons/mod/forum/components/post/post.html
index b95496e60..a3b998b29 100644
--- a/src/addons/mod/forum/components/post/post.html
+++ b/src/addons/mod/forum/components/post/post.html
@@ -17,7 +17,7 @@
                         </core-format-text>
                     </h2>
                     <ion-note *ngIf="trackPosts && post.unread"
-                        class="ion-float-end ion-padding-left ion-text-end" [attr.aria-label]="'addon.mod_forum.unread' | translate">
+                        class="ion-float-end ion-padding-start ion-text-end" [attr.aria-label]="'addon.mod_forum.unread' | translate">
                         <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
                     </ion-note>
                     <ion-button *ngIf="optionsMenuEnabled"
@@ -45,7 +45,7 @@
                     </div>
                     <ng-container *ngIf="!displaySubject">
                         <ion-note *ngIf="trackPosts && post.unread"
-                            class="ion-float-end ion-padding-left ion-text-end" [attr.aria-label]="'addon.mod_forum.unread' | translate">
+                            class="ion-float-end ion-padding-start ion-text-end" [attr.aria-label]="'addon.mod_forum.unread' | translate">
                             <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
                         </ion-note>
                         <ion-button *ngIf="optionsMenuEnabled"
diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index 9162073ee..8900625fe 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -129,7 +129,7 @@
                     (onPostChange)="postListChanged()">
                 </addon-mod-forum-post>
             </ion-card>
-            <div class="ion-padding-left" *ngIf="post.children && post.children.length && post.children[0].subject">
+            <div class="ion-padding-start" *ngIf="post.children && post.children.length && post.children[0].subject">
                 <ng-container *ngFor="let child of post.children">
                     <ng-container *ngTemplateOutlet="nestedPosts; context: {post: child}"></ng-container>
                 </ng-container>
diff --git a/src/addons/mod/imscp/components/toc/toc.html b/src/addons/mod/imscp/components/toc/toc.html
index bbe96f73e..2d06279f9 100644
--- a/src/addons/mod/imscp/components/toc/toc.html
+++ b/src/addons/mod/imscp/components/toc/toc.html
@@ -15,7 +15,7 @@
                 [attr.aria-current]="selected == item.href ? 'page' : 'false'" button detail="false">
                 <ion-label [class.core-bold]="!item.href">
                     <p class="item-heading">
-                        <span class="ion-padding-left" *ngFor="let i of getNumberForPadding(item.level)"></span>
+                        <span class="ion-padding-start" *ngFor="let i of getNumberForPadding(item.level)"></span>
                         {{item.title}}
                     </p>
                 </ion-label>
diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html
index 1d2d7f10a..e9507a60c 100644
--- a/src/addons/notifications/pages/list/list.html
+++ b/src/addons/notifications/pages/list/list.html
@@ -38,7 +38,7 @@
                     <p class="item-heading">{{ notification.subject }}</p>
                     <p *ngIf="notification.userfromfullname">{{ notification.userfromfullname }}</p>
                 </ion-label>
-                <ion-note slot="end" class="ion-float-end ion-padding-left ion-text-end">
+                <ion-note slot="end" class="ion-float-end ion-padding-start ion-text-end">
                     {{ notification.timecreated | coreDateDayOrTime }}
                     <span *ngIf="!notification.timeread">
                         <ion-icon name="fas-circle" color="primary" aria-hidden="true"></ion-icon>
diff --git a/src/core/features/rating/components/ratings/ratings-modal.html b/src/core/features/rating/components/ratings/ratings-modal.html
index 450a1435a..f6c05d92a 100644
--- a/src/core/features/rating/components/ratings/ratings-modal.html
+++ b/src/core/features/rating/components/ratings/ratings-modal.html
@@ -17,7 +17,7 @@
                     <h2>{{ rating.userfullname }}</h2>
                     <p>{{ rating.rating }}</p>
                 </ion-label>
-                <ion-note slot="end" class="ion-padding-left" *ngIf="rating.timemodified">
+                <ion-note slot="end" class="ion-padding-start" *ngIf="rating.timemodified">
                     {{ rating.timemodified | coreDateDayOrTime }}
                 </ion-note>
             </ion-item>