EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3426 from crazyserver/MOBILE-4081 

MOBILE-4081 login: Recover hide qrcode classes
main
Dani Palou 2022-10-28 14:46:37 +02:00 committed by GitHub
parent f8bfea8fa8 f554accfee
commit a157b5503c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/features/login/login.scss
View File

@ -101,6 +101,13 @@
--loading-spinner: #{$core-login-loading-color}; --loading-spinner: #{$core-login-loading-color};
} }
} }
@if ($core-login-hide-qrcode) {
.core-login-site-qrcode,
.core-login-site-qrcode-separator {
display: none;
}
}
} }
:host-context(html.dark) { :host-context(html.dark) {

4
src/core/features/login/pages/credentials/credentials.html
View File

@ -53,8 +53,8 @@
<input type="submit" class="core-submit-hidden-enter" /> <input type="submit" class="core-submit-hidden-enter" />
<ng-container *ngIf="showScanQR"> <ng-container *ngIf="showScanQR">
<div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div> <div class="ion-text-center ion-padding core-login-site-qrcode-separator">{{ 'core.login.or' | translate }}</div>
<ion-button expand="block" fill="outline" class="ion-margin" (click)="showInstructionsAndScanQR()"> <ion-button expand="block" fill="outline" class="ion-margin core-login-site-qrcode" (click)="showInstructionsAndScanQR()">
<ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon> <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
{{ 'core.scanqr' | translate }} {{ 'core.scanqr' | translate }}
</ion-button> </ion-button>

4
src/core/features/login/pages/reconnect/reconnect.html
View File

@ -62,8 +62,8 @@
</div> </div>
<ng-container *ngIf="showScanQR"> <ng-container *ngIf="showScanQR">
<div class="ion-text-center ion-padding">{{ 'core.login.or' | translate }}</div> <div class="ion-text-center ion-padding core-login-site-qrcode-separator">{{ 'core.login.or' | translate }}</div>
<ion-button expand="block" fill="outline" class="ion-margin" (click)="showInstructionsAndScanQR()"> <ion-button expand="block" fill="outline" class="ion-margin core-login-site-qrcode" (click)="showInstructionsAndScanQR()">
<ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon> <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
{{ 'core.scanqr' | translate }} {{ 'core.scanqr' | translate }}
</ion-button> </ion-button>

5
src/core/features/login/pages/site/site.html
View File

@ -101,8 +101,9 @@
</ng-container> </ng-container>
<ng-container *ngIf="showScanQR && !hasSites && !enteredSiteUrl"> <ng-container *ngIf="showScanQR && !hasSites && !enteredSiteUrl">
<div class="ion-text-center ion-padding ion-margin-top">{{ 'core.login.or' | translate }}</div> <div class="ion-text-center ion-padding ion-margin-top core-login-site-qrcode-separator">{{ 'core.login.or' | translate }}</div>
<ion-button expand="block" fill="outline" class="ion-margin" (click)="showInstructionsAndScanQR()" aria-haspopup="dialog"> <ion-button expand="block" fill="outline" class="ion-margin core-login-site-qrcode" (click)="showInstructionsAndScanQR()"
aria-haspopup="dialog">
<ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon> <ion-icon slot="start" name="fas-qrcode" aria-hidden="true"></ion-icon>
{{ 'core.scanqr' | translate }} {{ 'core.scanqr' | translate }}
</ion-button> </ion-button>

11
src/core/features/login/pages/site/site.scss
View File

@ -8,17 +8,6 @@
margin-bottom: 20px; margin-bottom: 20px;
} }
.item {
&.core-login-need-help {
margin-top: 16px;
}
&.core-login-site-qrcode {
.item-inner {
border-bottom: 0;
}
}
}
.core-login-site-connect { .core-login-site-connect {
margin-top: 1.4rem; margin-top: 1.4rem;
} }

1
src/theme/globals.variables.scss
View File

@ -102,6 +102,7 @@ $core-login-loading-color: false !default;
$core-login-loading-color-dark: $text-color-dark !default; $core-login-loading-color-dark: $text-color-dark !default;
$core-login-hide-forgot-password: false !default; $core-login-hide-forgot-password: false !default;
$core-login-hide-need-help: false !default; $core-login-hide-need-help: false !default;
$core-login-hide-qrcode: false !default;
// Configuration options for more page. (deprecated on 4.0) // Configuration options for more page. (deprecated on 4.0)
$core-more-hide-siteinfo: false !default; $core-more-hide-siteinfo: false !default;