Merge pull request #3062 from dpalou/MOBILE-3794

MOBILE-3794 sitepolicy: Make iframe bigger
main
Pau Ferrer Ocaña 2022-01-21 17:22:28 +01:00 committed by GitHub
commit c3cc36477f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 3 deletions

View File

@ -24,13 +24,13 @@
</p>
</ion-label>
</ion-item>
<ion-card *ngIf="showInline">
<ion-card *ngIf="showInline" class="core-site-policy-iframe-container">
<core-iframe [src]="sitePolicy"></core-iframe>
</ion-card>
<ion-button class="ion-text-wrap ion-margin" expand="block" (click)="accept()">
<ion-button class="ion-text-wrap ion-margin-horizontal" expand="block" (click)="accept()">
{{ 'core.login.policyaccept' | translate }}
</ion-button>
<ion-button class="ion-text-wrap ion-margin" expand="block" color="light" (click)="cancel()">
<ion-button class="ion-text-wrap ion-margin-horizontal ion-margin-bottom" expand="block" color="light" (click)="cancel()">
{{ 'core.login.cancel' | translate }}
</ion-button>
</ion-list>

View File

@ -0,0 +1,26 @@
:host {
ion-list {
display: flex;
flex-direction: column;
height: 100%;
ion-item {
flex-shrink: 0;
}
.core-site-policy-iframe-container {
height: 100%;
core-iframe {
height: 100%;
width: 100%;
}
}
}
}
:host core-loading ::ng-deep {
.core-loading-content {
height: 100%;
}
}

View File

@ -29,6 +29,7 @@ import { CoreEvents } from '@singletons/events';
@Component({
selector: 'page-core-login-site-policy',
templateUrl: 'site-policy.html',
styleUrls: ['site-policy.scss'],
})
export class CoreLoginSitePolicyPage implements OnInit {