diff --git a/app-template/bitpay/sass/overrides.scss b/app-template/bitpay/sass/overrides.scss index db6c26a5f..3c55a7318 100644 --- a/app-template/bitpay/sass/overrides.scss +++ b/app-template/bitpay/sass/overrides.scss @@ -22,3 +22,4 @@ $colors: ( ); $icon-border-radius: 50%; +$toolbar-background: #1e3186; diff --git a/app-template/config-template.xml b/app-template/config-template.xml index 0545f5f03..9ee7c2fc3 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -18,11 +18,11 @@ - + diff --git a/app-template/copay/sass/overrides.scss b/app-template/copay/sass/overrides.scss index a2d9ae5a0..21fd5fdef 100644 --- a/app-template/copay/sass/overrides.scss +++ b/app-template/copay/sass/overrides.scss @@ -22,3 +22,4 @@ $colors: ( ); $icon-border-radius: 3px; +$toolbar-background: #192c3a; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 989f18489..77d0ca2bd 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -60,6 +60,7 @@ export class CopayApp { ' #' + this.app.info.commitHash); if (this.platform.is('cordova')) { + this.statusBar.show(); this.statusBar.overlaysWebView(true); this.statusBar.styleLightContent(); this.splashScreen.hide(); diff --git a/src/pages/home/home.html b/src/pages/home/home.html index c6e2540b1..99d53e034 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -1,6 +1,8 @@ - {{'Home' | translate}} + + + diff --git a/src/pages/home/home.scss b/src/pages/home/home.scss index f2a162181..6c822d813 100644 --- a/src/pages/home/home.scss +++ b/src/pages/home/home.scss @@ -1,4 +1,12 @@ page-home { + .home-logo { + height: 26px; + position: relative; + top: 3px; + } + .toolbar-title-ios { + text-align: center; + } .check{ text-align: center; .title { diff --git a/src/pages/onboarding/backup-request/backup-request.scss b/src/pages/onboarding/backup-request/backup-request.scss index f5502f04f..6766f7c4c 100644 --- a/src/pages/onboarding/backup-request/backup-request.scss +++ b/src/pages/onboarding/backup-request/backup-request.scss @@ -1,7 +1,12 @@ page-backup-request { text-align: center; - .toolbar-background{ - background-color: transparent; + ion-header { + .toolbar-title, ion-icon { + color: color($colors, primary); + } + .toolbar-background { + background-color: transparent; + } } p { line-height: 1.6; diff --git a/src/pages/onboarding/collect-email/collect-email.html b/src/pages/onboarding/collect-email/collect-email.html index 5da7ef85b..5d3b1c635 100644 --- a/src/pages/onboarding/collect-email/collect-email.html +++ b/src/pages/onboarding/collect-email/collect-email.html @@ -2,7 +2,7 @@ - + @@ -22,7 +22,7 @@ - + Get news and updates from BitPay @@ -48,4 +48,4 @@ - \ No newline at end of file + diff --git a/src/pages/onboarding/collect-email/collect-email.scss b/src/pages/onboarding/collect-email/collect-email.scss index 1eb5d6fa1..1bf8ab7e9 100644 --- a/src/pages/onboarding/collect-email/collect-email.scss +++ b/src/pages/onboarding/collect-email/collect-email.scss @@ -1,8 +1,13 @@ page-collect-email { - text-align: center; - .toolbar-background{ - background-color: transparent; + ion-header { + .toolbar-title, ion-icon { + color: color($colors, primary); + } + .toolbar-background { + background-color: transparent; + } } + text-align: center; p { line-height: 1.6; font-size: 18px; diff --git a/src/pages/onboarding/disclaimer/disclaimer.html b/src/pages/onboarding/disclaimer/disclaimer.html index 41683a890..63908bf91 100644 --- a/src/pages/onboarding/disclaimer/disclaimer.html +++ b/src/pages/onboarding/disclaimer/disclaimer.html @@ -5,7 +5,7 @@

Quick review!

Almost done! Let's review.

Bitcoin is different – it cannot be safely held with a bank or web service.

- + I understand that my funds are held securely on this device, not by a company. @@ -17,7 +17,7 @@
Terms of Use - + I have read, understood, and agree to the diff --git a/src/pages/onboarding/disclaimer/disclaimer.scss b/src/pages/onboarding/disclaimer/disclaimer.scss index da6a1b2a9..08f291be3 100644 --- a/src/pages/onboarding/disclaimer/disclaimer.scss +++ b/src/pages/onboarding/disclaimer/disclaimer.scss @@ -1,7 +1,12 @@ page-disclaimer { text-align: center; - .toolbar-background{ - background-color: transparent; + ion-header { + .toolbar-title, ion-icon { + color: color($colors, primary); + } + .toolbar-background { + background-color: transparent; + } } .link { font-size: 2vh; diff --git a/src/pages/onboarding/tour/tour.html b/src/pages/onboarding/tour/tour.html index 533175f40..bb5c105e1 100644 --- a/src/pages/onboarding/tour/tour.html +++ b/src/pages/onboarding/tour/tour.html @@ -2,7 +2,7 @@ - diff --git a/src/pages/onboarding/tour/tour.scss b/src/pages/onboarding/tour/tour.scss index fea109ba8..b134fc15b 100644 --- a/src/pages/onboarding/tour/tour.scss +++ b/src/pages/onboarding/tour/tour.scss @@ -1,6 +1,11 @@ page-tour { - .toolbar-background{ - background-color: transparent; + ion-header { + .toolbar-title, ion-icon { + color: color($colors, primary); + } + .toolbar-background { + background-color: transparent; + } } .bottom-absolute { padding: 15px 15px 5vh 15px; diff --git a/src/pages/wallet-details/wallet-details.html b/src/pages/wallet-details/wallet-details.html index 81adb1bc6..7e775f9a2 100644 --- a/src/pages/wallet-details/wallet-details.html +++ b/src/pages/wallet-details/wallet-details.html @@ -1,5 +1,5 @@ - - + + {{wallet.name}} diff --git a/src/pages/wallet-details/wallet-details.scss b/src/pages/wallet-details/wallet-details.scss index dfc812e23..e03d4b07a 100644 --- a/src/pages/wallet-details/wallet-details.scss +++ b/src/pages/wallet-details/wallet-details.scss @@ -1,16 +1,22 @@ page-wallet-details { + ion-header { + .toolbar-title, ion-icon { + color: color($colors, light); + } + background-color: color($colors, primary); + } .balance-card { background: color($colors, primary); } .balance-header { position: relative; color: color($colors, light); - height: 14rem; + height: 10rem; text-align: center; } .balance-str { cursor: pointer; - padding-top: 5rem; + padding-top: 1rem; font-size: 35px; font-weight: 600; } @@ -20,12 +26,12 @@ page-wallet-details { } .balance-hidden { cursor: pointer; - padding-top: 5rem; + padding-top: 1rem; font-size: 20px; font-weight: 500; } .balance-error { - padding: 10% 1rem 0 1rem; + padding: 5% 1rem 0 1rem; } .balance-spendable { cursor: pointer; @@ -35,7 +41,7 @@ page-wallet-details { } } .balance-scanning { - padding-top: 6rem; + padding-top: 1rem; } .tx-history { img {