mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #7773 from cmgustavo/v4-38
[v4] Mobile: StatusBar. Color Header (walletDetails)
This commit is contained in:
commit
6334f811a6
|
@ -22,3 +22,4 @@ $colors: (
|
||||||
);
|
);
|
||||||
|
|
||||||
$icon-border-radius: 50%;
|
$icon-border-radius: 50%;
|
||||||
|
$toolbar-background: #1e3186;
|
||||||
|
|
|
@ -18,11 +18,11 @@
|
||||||
<preference name="DisallowOverscroll" value="true"/>
|
<preference name="DisallowOverscroll" value="true"/>
|
||||||
<preference name="HideKeyboardFormAccessoryBar" value="true"/>
|
<preference name="HideKeyboardFormAccessoryBar" value="true"/>
|
||||||
|
|
||||||
<preference name="StatusBarBackgroundColor" value="*THEMECOLOR*" />
|
|
||||||
<preference name="BackupWebStorage" value="none"/>
|
<preference name="BackupWebStorage" value="none"/>
|
||||||
<preference name="Orientation" value="default" />
|
<preference name="Orientation" value="default" />
|
||||||
<preference name="cordova-custom-config-stoponerror" value="true" />
|
<preference name="cordova-custom-config-stoponerror" value="true" />
|
||||||
|
|
||||||
|
<preference name="StatusBarBackgroundColor" value="*THEMECOLOR*" />
|
||||||
<preference name="StatusBarOverlaysWebView" value="true" />
|
<preference name="StatusBarOverlaysWebView" value="true" />
|
||||||
<preference name="StatusBarStyle" value="lightcontent" />
|
<preference name="StatusBarStyle" value="lightcontent" />
|
||||||
|
|
||||||
|
|
|
@ -22,3 +22,4 @@ $colors: (
|
||||||
);
|
);
|
||||||
|
|
||||||
$icon-border-radius: 3px;
|
$icon-border-radius: 3px;
|
||||||
|
$toolbar-background: #192c3a;
|
||||||
|
|
|
@ -60,6 +60,7 @@ export class CopayApp {
|
||||||
' #' + this.app.info.commitHash);
|
' #' + this.app.info.commitHash);
|
||||||
|
|
||||||
if (this.platform.is('cordova')) {
|
if (this.platform.is('cordova')) {
|
||||||
|
this.statusBar.show();
|
||||||
this.statusBar.overlaysWebView(true);
|
this.statusBar.overlaysWebView(true);
|
||||||
this.statusBar.styleLightContent();
|
this.statusBar.styleLightContent();
|
||||||
this.splashScreen.hide();
|
this.splashScreen.hide();
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
<ion-header>
|
<ion-header>
|
||||||
<ion-navbar>
|
<ion-navbar>
|
||||||
<ion-title>{{'Home' | translate}}</ion-title>
|
<ion-title>
|
||||||
|
<img class="home-logo" src="assets/img/app/logo-negative.svg">
|
||||||
|
</ion-title>
|
||||||
</ion-navbar>
|
</ion-navbar>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,12 @@
|
||||||
page-home {
|
page-home {
|
||||||
|
.home-logo {
|
||||||
|
height: 26px;
|
||||||
|
position: relative;
|
||||||
|
top: 3px;
|
||||||
|
}
|
||||||
|
.toolbar-title-ios {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
.check{
|
.check{
|
||||||
text-align: center;
|
text-align: center;
|
||||||
.title {
|
.title {
|
||||||
|
|
|
@ -1,7 +1,12 @@
|
||||||
page-backup-request {
|
page-backup-request {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
.toolbar-background{
|
ion-header {
|
||||||
background-color: transparent;
|
.toolbar-title, ion-icon {
|
||||||
|
color: color($colors, primary);
|
||||||
|
}
|
||||||
|
.toolbar-background {
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
p {
|
p {
|
||||||
line-height: 1.6;
|
line-height: 1.6;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<ion-navbar hideBackButton="true">
|
<ion-navbar hideBackButton="true">
|
||||||
<ion-buttons end>
|
<ion-buttons end>
|
||||||
<button ion-button icon-only (click)="skip()" translate>Skip</button>
|
<button ion-button color="primary" (click)="skip()" translate>Skip</button>
|
||||||
</ion-buttons>
|
</ion-buttons>
|
||||||
</ion-navbar>
|
</ion-navbar>
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
<ion-input type="email" formControlName="email" placeholder="Email Input"></ion-input>
|
<ion-input type="email" formControlName="email" placeholder="Email Input"></ion-input>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
|
|
||||||
<ion-item no-lines>
|
<ion-item no-lines text-wrap>
|
||||||
<ion-label translate>Get news and updates from BitPay</ion-label>
|
<ion-label translate>Get news and updates from BitPay</ion-label>
|
||||||
<ion-checkbox formControlName="accept" checked="true"></ion-checkbox>
|
<ion-checkbox formControlName="accept" checked="true"></ion-checkbox>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
|
|
|
@ -1,8 +1,13 @@
|
||||||
page-collect-email {
|
page-collect-email {
|
||||||
text-align: center;
|
ion-header {
|
||||||
.toolbar-background{
|
.toolbar-title, ion-icon {
|
||||||
background-color: transparent;
|
color: color($colors, primary);
|
||||||
|
}
|
||||||
|
.toolbar-background {
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
text-align: center;
|
||||||
p {
|
p {
|
||||||
line-height: 1.6;
|
line-height: 1.6;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<h1 *ngIf="resume" translate>Quick review!</h1>
|
<h1 *ngIf="resume" translate>Quick review!</h1>
|
||||||
<h1 *ngIf="!resume" translate>Almost done! Let's review.</h1>
|
<h1 *ngIf="!resume" translate>Almost done! Let's review.</h1>
|
||||||
<p translate>Bitcoin is different – it cannot be safely held with a bank or web service.</p>
|
<p translate>Bitcoin is different – it cannot be safely held with a bank or web service.</p>
|
||||||
<ion-list text-wrap>
|
<ion-list no-lines text-wrap>
|
||||||
<ion-item>
|
<ion-item>
|
||||||
<ion-label>I understand that my funds are held securely on this device, not by a company.</ion-label>
|
<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-checkbox [(ngModel)]="accepted.first"></ion-checkbox>
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
</ion-list>
|
</ion-list>
|
||||||
<div class="bottom-absolute" *ngIf="accepted.first && accepted.second">
|
<div class="bottom-absolute" *ngIf="accepted.first && accepted.second">
|
||||||
<a class="link" (click)="openDisclaimer()" translate>Terms of Use</a>
|
<a class="link" (click)="openDisclaimer()" translate>Terms of Use</a>
|
||||||
<ion-item no-lines>
|
<ion-item no-lines text-wrap>
|
||||||
<ion-label>
|
<ion-label>
|
||||||
<span translate>I have read, understood, and agree to the </span>
|
<span translate>I have read, understood, and agree to the </span>
|
||||||
</ion-label>
|
</ion-label>
|
||||||
|
|
|
@ -1,7 +1,12 @@
|
||||||
page-disclaimer {
|
page-disclaimer {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
.toolbar-background{
|
ion-header {
|
||||||
background-color: transparent;
|
.toolbar-title, ion-icon {
|
||||||
|
color: color($colors, primary);
|
||||||
|
}
|
||||||
|
.toolbar-background {
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.link {
|
.link {
|
||||||
font-size: 2vh;
|
font-size: 2vh;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<ion-navbar>
|
<ion-navbar>
|
||||||
<ion-buttons end>
|
<ion-buttons end>
|
||||||
<button ion-button icon-only (click)="createDefaultWallet()" *ngIf="currentIndex == 0" translate>
|
<button ion-button color="primary" (click)="createDefaultWallet()" *ngIf="currentIndex == 0" translate>
|
||||||
Skip
|
Skip
|
||||||
</button>
|
</button>
|
||||||
</ion-buttons>
|
</ion-buttons>
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
page-tour {
|
page-tour {
|
||||||
.toolbar-background{
|
ion-header {
|
||||||
background-color: transparent;
|
.toolbar-title, ion-icon {
|
||||||
|
color: color($colors, primary);
|
||||||
|
}
|
||||||
|
.toolbar-background {
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.bottom-absolute {
|
.bottom-absolute {
|
||||||
padding: 15px 15px 5vh 15px;
|
padding: 15px 15px 5vh 15px;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<ion-header>
|
<ion-header no-border [ngStyle]="{'background-color': wallet.color}">
|
||||||
<ion-navbar>
|
<ion-navbar transparent>
|
||||||
<ion-title>{{wallet.name}}</ion-title>
|
<ion-title>{{wallet.name}}</ion-title>
|
||||||
</ion-navbar>
|
</ion-navbar>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
|
|
|
@ -1,16 +1,22 @@
|
||||||
page-wallet-details {
|
page-wallet-details {
|
||||||
|
ion-header {
|
||||||
|
.toolbar-title, ion-icon {
|
||||||
|
color: color($colors, light);
|
||||||
|
}
|
||||||
|
background-color: color($colors, primary);
|
||||||
|
}
|
||||||
.balance-card {
|
.balance-card {
|
||||||
background: color($colors, primary);
|
background: color($colors, primary);
|
||||||
}
|
}
|
||||||
.balance-header {
|
.balance-header {
|
||||||
position: relative;
|
position: relative;
|
||||||
color: color($colors, light);
|
color: color($colors, light);
|
||||||
height: 14rem;
|
height: 10rem;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
.balance-str {
|
.balance-str {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
padding-top: 5rem;
|
padding-top: 1rem;
|
||||||
font-size: 35px;
|
font-size: 35px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
|
@ -20,12 +26,12 @@ page-wallet-details {
|
||||||
}
|
}
|
||||||
.balance-hidden {
|
.balance-hidden {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
padding-top: 5rem;
|
padding-top: 1rem;
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
.balance-error {
|
.balance-error {
|
||||||
padding: 10% 1rem 0 1rem;
|
padding: 5% 1rem 0 1rem;
|
||||||
}
|
}
|
||||||
.balance-spendable {
|
.balance-spendable {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
@ -35,7 +41,7 @@ page-wallet-details {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.balance-scanning {
|
.balance-scanning {
|
||||||
padding-top: 6rem;
|
padding-top: 1rem;
|
||||||
}
|
}
|
||||||
.tx-history {
|
.tx-history {
|
||||||
img {
|
img {
|
||||||
|
|
Loading…
Reference in New Issue