From 4d527aa0a8424f86b47bf2641f379cd39514f566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Nov 2022 11:11:22 +0100
Subject: [PATCH 1/2] MOBILE-4081 chore: Adapt viewport to Chrome 108

See https://ionic.io/blog/preparing-your-ionic-app-for-changes-coming-to-chrome-for-android for more info
---
 src/index.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/index.html b/src/index.html
index 44e690189..864f4b89a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -8,8 +8,10 @@
     <base href="/" />
 
     <meta name="color-scheme" content="light dark" />
-    <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <meta http-equiv="Content-Security-Policy" content="default-src * filesystem: cdvfile: file: data: gap: moodleappfs: blob: 'unsafe-inline' 'unsafe-eval' 'self' android-webview-video-poster: about:">
+    <meta name="viewport"
+        content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, interactive-widget=resizes-content" />
+    <meta http-equiv="Content-Security-Policy"
+        content="default-src * filesystem: cdvfile: file: data: gap: moodleappfs: blob: 'unsafe-inline' 'unsafe-eval' 'self' android-webview-video-poster: about:">
     <meta name="format-detection" content="telephone=no" />
     <meta name="msapplication-tap-highlight" content="no" />
 

From 88cdec2e877eab6b9aa5c39b437c1f57237395e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Nov 2022 11:19:04 +0100
Subject: [PATCH 2/2] MOBILE-4081 login: Maintain a logic sort on login
 reconnect buttons

---
 src/core/features/login/pages/reconnect/reconnect.html | 8 ++++----
 src/theme/theme.base.scss                              | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html
index 94d6a452c..a16c76911 100644
--- a/src/core/features/login/pages/reconnect/reconnect.html
+++ b/src/core/features/login/pages/reconnect/reconnect.html
@@ -63,14 +63,14 @@
                         </ion-input>
                     </core-show-password>
                 </ion-item>
-                <div class="adaptable-buttons-row">
-                    <ion-button expand="block" fill="outline" (click)="cancel($event)" class="ion-margin ion-text-wrap">
-                        {{ 'core.login.cancel' | translate }}
-                    </ion-button>
+                <div class="adaptable-buttons-row-reverse">
                     <ion-button *ngIf="!isBrowserSSO" type="submit" expand="block" [disabled]="!credForm.valid"
                         class="ion-margin core-login-login-button ion-text-wrap">
                         {{ 'core.login.loginbutton' | translate }}
                     </ion-button>
+                    <ion-button expand="block" fill="outline" (click)="cancel($event)" class="ion-margin ion-text-wrap">
+                        {{ 'core.login.cancel' | translate }}
+                    </ion-button>
                 </div>
 
                 <ion-button expand="block" *ngIf="isBrowserSSO" (click)="openBrowserSSO()"
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss
index f0245c87c..1d3272385 100644
--- a/src/theme/theme.base.scss
+++ b/src/theme/theme.base.scss
@@ -1674,13 +1674,19 @@ ion-grid.core-no-grid > ion-row {
 }
 
 @include media-breakpoint-up(md) {
-    .adaptable-buttons-row {
+    .adaptable-buttons-row,
+    .adaptable-buttons-row-reverse {
         display: flex;
         flex-direction: row;
         ion-button {
             flex: 1;
         }
     }
+
+    // Buttons will be in reverse order when horizontal.
+    .adaptable-buttons-row-reverse {
+        flex-direction: row-reverse;
+    }
 }
 
 ion-header.no-title {