MOBILE-4201 login: Remove cancel button from reconnect page

main
Pau Ferrer Ocaña 2023-09-08 14:30:13 +02:00
parent ff00454e33
commit 7dec27239d
3 changed files with 14 additions and 18 deletions

View File

@ -1,8 +1,8 @@
<ion-header> <ion-header>
<ion-toolbar> <ion-toolbar>
<ion-buttons slot="start"> <ion-buttons slot="start">
<ion-button fill="clear" (click)="close($event)" [attr.aria-label]="'core.back' | translate"> <ion-button fill="clear" (click)="close($event)" [attr.aria-label]="'core.back' | translate" class="ion-back-button">
<ion-icon name="arrow-back" slot="icon-only" aria-hidden="true"></ion-icon> <ion-icon ios="chevron-back" md="arrow-back-sharp" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button> </ion-button>
</ion-buttons> </ion-buttons>

View File

@ -1,7 +1,9 @@
<ion-header> <ion-header>
<ion-toolbar> <ion-toolbar>
<ion-buttons slot="start"> <ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button> <ion-button fill="clear" (click)="cancel($event)" [attr.aria-label]="'core.back' | translate" class="ion-back-button">
<ion-icon ios="chevron-back" md="arrow-back-sharp" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button>
</ion-buttons> </ion-buttons>
<ion-title> <ion-title>
@ -63,15 +65,10 @@
</ion-input> </ion-input>
</core-show-password> </core-show-password>
</ion-item> </ion-item>
<div class="adaptable-buttons-row-reverse">
<ion-button *ngIf="!isBrowserSSO" type="submit" expand="block" [disabled]="!credForm.valid" <ion-button *ngIf="!isBrowserSSO" type="submit" expand="block" [disabled]="!credForm.valid"
class="ion-margin core-login-login-button ion-text-wrap"> class="ion-margin core-login-login-button ion-text-wrap">
{{ 'core.login.loginbutton' | translate }} {{ 'core.login.loginbutton' | translate }}
</ion-button> </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()" <ion-button expand="block" *ngIf="isBrowserSSO" (click)="openBrowserSSO()"
class="ion-margin core-login-login-button ion-text-wrap"> class="ion-margin core-login-login-button ion-text-wrap">
@ -89,12 +86,6 @@
<core-login-methods *ngIf="siteConfig" [siteConfig]="siteConfig" [reconnect]="true" [siteUrl]="siteUrl" <core-login-methods *ngIf="siteConfig" [siteConfig]="siteConfig" [reconnect]="true" [siteUrl]="siteUrl"
[redirectData]="redirectData"></core-login-methods> [redirectData]="redirectData"></core-login-methods>
<!-- If OAuth, display cancel button since the form isn't displayed. -->
<ion-list *ngIf="isOAuth">
<ion-button expand="block" class="ion-margin" fill="outline" (click)="cancel($event)">
{{ 'core.login.cancel' | translate }}
</ion-button>
</ion-list>
</div> </div>
</core-loading> </core-loading>
</ion-content> </ion-content>

View File

@ -173,6 +173,11 @@ ion-header {
display: none; display: none;
} }
// Style fake back button like the original ones.
ion-button.ion-back-button {
width: 48px !important;
}
.button.button-clear.button-has-icon-only, .button.button-clear.button-has-icon-only,
.button.button-solid.button-has-icon-only { .button.button-solid.button-has-icon-only {
width: var(--a11y-min-target-size); width: var(--a11y-min-target-size);