Merge pull request #3476 from crazyserver/MOBILE-4081

Mobile 4081
main
Dani Palou 2022-11-25 11:48:36 +01:00 committed by GitHub
commit 63621a0789
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 7 deletions

View File

@ -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()"

View File

@ -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" />

View File

@ -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 {