Add new font and update login

This commit is contained in:
Rene Vergara 2022-01-15 07:59:25 -06:00
parent 1134f1760c
commit 18f1667a00
6 changed files with 17 additions and 21 deletions

View file

@ -3,7 +3,7 @@ main{
} }
.footer{ .footer{
font-family: 'Saira Semi Condensed', sans-serif; font-family: 'Spartan', sans-serif;
font-size: 12px; font-size: 12px;
} }

View file

@ -1,5 +1,5 @@
* { * {
font-family: 'Saira Semi Condensed', sans-serif; font-family: 'Spartan', sans-serif;
} }
mat-card.coolcard{ mat-card.coolcard{
background-color: #FF5722; background-color: #FF5722;
@ -7,7 +7,7 @@ mat-card.coolcard{
margin: 5px; margin: 5px;
} }
mat-card.centercard{ mat-card.centercard{
max-width: 400px; max-width: 450px;
border: 1px solid #CCCCCC; border: 1px solid #CCCCCC;
} }
.icon{ .icon{
@ -26,3 +26,6 @@ mat-card.centercard{
.numbers{ .numbers{
font-family: 'Roboto Mono', monospace; font-family: 'Roboto Mono', monospace;
} }
::ng-deep .mat-step-label{
font-size: 13px;
}

View file

@ -8,21 +8,12 @@
<mat-card class="centercard"> <mat-card class="centercard">
<h3>The Zcash Register</h3> <h3>The Zcash Register</h3>
<mat-vertical-stepper #stepper linear> <mat-vertical-stepper #stepper linear>
<mat-step label="Log in with a shielded memo" editable="false"> <mat-step label="Connect your wallet to ZGo" editable="false">
<mat-card [formGroup]="entryForm"> <mat-card>
<div align="center" id="info"> <div align="center" id="info">
<p>Select your session length and confirm once you've sent your memo:</p>
<mat-form-field appearance="outline">
<mat-label>Session length</mat-label>
<mat-select formControlName="selectedSession">
<mat-option *ngFor="let ticket of tickets" [value]="ticket.value">
{{ticket.viewValue}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-card-actions> <mat-card-actions>
<button mat-raised-button color="primary" [disabled]="!entryForm.valid" (click)="login(stepper)"> <button mat-raised-button color="primary" (click)="login(stepper)">
<mat-icon class="icon">login</mat-icon><span class="bigbutton">Log in</span> <mat-icon class="icon">login</mat-icon><span class="bigbutton">Link wallet</span>
</button> </button>
</mat-card-actions> </mat-card-actions>
</div> </div>

View file

@ -157,7 +157,7 @@ export class LoginComponent implements OnInit, AfterViewInit {
dialogConfig.disableClose = true; dialogConfig.disableClose = true;
dialogConfig.autoFocus = true; dialogConfig.autoFocus = true;
dialogConfig.data = { dialogConfig.data = {
totalZec: this.entryForm.value.selectedSession, totalZec: 1e-8,
addr: this.nodeAddress, addr: this.nodeAddress,
session: this.localToken session: this.localToken
}; };

View file

@ -6,9 +6,10 @@
<base href="/"> <base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
<link rel="preconnect" href="https://fonts.gstatic.com"> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link rel="preconnect" href="https://fonts.googleapis.com">
<link href="https://fonts.googleapis.com/css2?family=Roboto+Mono&family=Saira+Semi+Condensed:wght@400;500&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Roboto+Mono&family=Saira+Semi+Condensed:wght@400;500&family=Spartan:wght@500;700&display=swap" rel="stylesheet">
</head> </head>
<body> <body>
<app-root></app-root> <app-root></app-root>

View file

@ -19,8 +19,9 @@
/*@include mat.all-component-themes($my-theme);*/ /*@include mat.all-component-themes($my-theme);*/
@import './custom-theme.scss'; @import './custom-theme.scss';
html, body { height: 100%; } html, body { height: 100%; }
body { body {
margin: 0; margin: 0;
font-family: Roboto, "Helvetica Neue", sans-serif; font-family: 'Spartan', sans-serif;
} }