BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7969 from Gamboster/fix/collectorEmailAndDisclaimerStyles 

[V4] Fix: Styles for items on collector email and disclaimer
This commit is contained in:
Gustavo Maximiliano Cortez 2018-01-31 15:07:09 -03:00 committed by GitHub
parent b7a3997333 27d076128d
commit bde9ba1b99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/onboarding/collect-email/collect-email.html
View File

@ -17,7 +17,7 @@
<div class="bottom-absolute">
<p translate>Where would you like to receive email notifications about payments?</p>
<form [formGroup]="emailForm" (ngSubmit)="showConfirm()">
<form class="email-form" [formGroup]="emailForm" (ngSubmit)="showConfirm()">
<ion-item>
<ion-input type="email" formControlName="email" placeholder="Email Input"></ion-input>
</ion-item>
@ -48,4 +48,4 @@
</div>
</div>
</div>
</ion-content>
</ion-content>

6
src/pages/onboarding/collect-email/collect-email.scss
View File

@ -16,4 +16,10 @@ page-collect-email {
margin-right: 10px;
margin-left: 10px;
}
.email-form {
ion-item {
background: none;
color: #fff;
}
}
}

13
src/pages/onboarding/disclaimer/disclaimer.html
View File

@ -5,24 +5,25 @@
<h1 *ngIf="resume" translate>Quick review!</h1>
<h1 *ngIf="!resume" translate>Almost done! Let's review.</h1>
<p translate>Bitcoin is different &ndash; it cannot be safely held with a bank or web service.</p>
<ion-list no-lines text-wrap>
<ion-list class="checkbox-list" no-lines text-wrap>
<ion-item>
<ion-label>I understand that my funds are held securely on this device, not by a company.</ion-label>
<ion-checkbox [(ngModel)]="accepted.first"></ion-checkbox>
</ion-item>
<ion-item>
<ion-label>I understand that if this app is moved to another device or deleted, my bitcoin can only be recovered with the backup phrase.</ion-label>
<ion-label>I understand that if this app is moved to another device or deleted, my bitcoin can only be recovered with the backup
phrase.</ion-label>
<ion-checkbox [(ngModel)]="accepted.second"></ion-checkbox>
</ion-item>
</ion-list>
<div class="bottom-absolute" *ngIf="accepted.first && accepted.second">
<div class="bottom-absolute checkbox-list" *ngIf="accepted.first && accepted.second">
<a class="link" (click)="openDisclaimer()" translate>Terms of Use</a>
<ion-item no-lines text-wrap>
<ion-label>
<span translate>I have read, understood, and agree to the </span>
</ion-label>
<ion-checkbox [(ngModel)]="terms.accepted"></ion-checkbox>
<ion-checkbox [(ngModel)]="terms.accepted"></ion-checkbox>
</ion-item>
<button ion-button block [disabled]="!accepted.first || !accepted.second || !terms.accepted" (click)="confirm()" translate>Confirm &amp; Finish</button>
<button ion-button block [disabled]="!accepted.first || !accepted.second || !terms.accepted" (click)="confirm()" translate>Confirm &amp; Finish</button>
</div>
</ion-content>
</ion-content>

6
src/pages/onboarding/disclaimer/disclaimer.scss
View File

@ -20,4 +20,10 @@ page-disclaimer {
margin-right: 10px;
margin-left: 10px;
}
.checkbox-list {
ion-item {
background: none;
color: #fff;
}
}
}