diff --git a/app-template/bitpay/appConfig.json b/app-template/bitpay/appConfig.json index 3c0ee862b..79eb58f52 100644 --- a/app-template/bitpay/appConfig.json +++ b/app-template/bitpay/appConfig.json @@ -13,12 +13,12 @@ "gitHubRepoName": "bitpay-wallet", "disclaimerUrl": "", "url": "https://bitpay.com", - "appDescription": "Secure Bitcoin Storage", + "appDescription": "Secure Bitcoin Wallet", "winAppName": "BitPayWallet", "wpPublisherId": "{}", "wpProductId": "{}", "pushSenderId": "1036948132229", - "description": "Secure Bitcoin Storage", + "description": "Secure Bitcoin Wallet", "version": "0.14.0", "androidVersion": "1", "_extraCSS": null, diff --git a/resources/bitpay/ios/splash/Default-Landscape@2x~ipad.png b/resources/bitpay/ios/splash/Default-Landscape@2x~ipad.png index 802cba411..ccd9ed2ba 100644 Binary files a/resources/bitpay/ios/splash/Default-Landscape@2x~ipad.png and b/resources/bitpay/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/resources/bitpay/ios/splash/Default-Portrait@2x~ipad.png b/resources/bitpay/ios/splash/Default-Portrait@2x~ipad.png index 9c3d18c02..01150bcf7 100644 Binary files a/resources/bitpay/ios/splash/Default-Portrait@2x~ipad.png and b/resources/bitpay/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/resources/copay/ios/splash/Default-Landscape@2x~ipad.png b/resources/copay/ios/splash/Default-Landscape@2x~ipad.png index 503dce051..8985d0383 100644 Binary files a/resources/copay/ios/splash/Default-Landscape@2x~ipad.png and b/resources/copay/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/resources/copay/ios/splash/Default-Portrait@2x~ipad.png b/resources/copay/ios/splash/Default-Portrait@2x~ipad.png index d0c7ebf00..8ea39983e 100644 Binary files a/resources/copay/ios/splash/Default-Portrait@2x~ipad.png and b/resources/copay/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/resources/src.sketch b/resources/src.sketch index 74903e9d7..5548d3d02 100644 Binary files a/resources/src.sketch and b/resources/src.sketch differ diff --git a/src/sass/icons.scss b/src/sass/icons.scss index 543ab49d2..fd352e9ca 100644 --- a/src/sass/icons.scss +++ b/src/sass/icons.scss @@ -14,6 +14,19 @@ padding-left: 74px; } + +.icon-svg { + display: flex; + justify-content: center; + align-items: center; + > img { + background-repeat:no-repeat; + background-clip: padding-box; + background-size: contain; + height: 18px; + } +} + .big-icon-svg { padding: 0 7px; > .bg { diff --git a/src/sass/ionic.scss b/src/sass/ionic.scss index c7c3e0f1c..4b1d5b6b1 100644 --- a/src/sass/ionic.scss +++ b/src/sass/ionic.scss @@ -27,3 +27,14 @@ ion-tabs.ion-tabs-transparent { } } } + +// .placeholder-icon padding cannot be modified by a variable +$placeholder-icon-padding: 10px; +.placeholder-icon { + &:first-child { + padding-right: $placeholder-icon-padding; + } + &:last-child { + padding-left: $placeholder-icon-padding; + } +} diff --git a/src/sass/views/includes/modals/backup-confirm-modal.scss b/src/sass/views/includes/modals/backup-confirm-modal.scss deleted file mode 100644 index 430d8cb5c..000000000 --- a/src/sass/views/includes/modals/backup-confirm-modal.scss +++ /dev/null @@ -1,3 +0,0 @@ -#backup-confirm-modal{ - -} \ No newline at end of file diff --git a/src/sass/views/includes/modals/backup-needed-modal.scss b/src/sass/views/includes/modals/backup-needed-modal.scss new file mode 100644 index 000000000..9e9ed5620 --- /dev/null +++ b/src/sass/views/includes/modals/backup-needed-modal.scss @@ -0,0 +1,12 @@ +#backup-needed-modal{ + .button.button-secondary { + font-size: 14px; + margin-top: 0; + } + .button { + display: block; + margin-right: auto; + margin-left: auto; + margin-top: 1rem; + } +} diff --git a/src/sass/views/includes/modals/modals.scss b/src/sass/views/includes/modals/modals.scss index 742ee9aee..6d3fcfc4a 100644 --- a/src/sass/views/includes/modals/modals.scss +++ b/src/sass/views/includes/modals/modals.scss @@ -73,5 +73,5 @@ background: rgba(0, 0, 0, .8); } -@import "backup-confirm-modal"; +@import "backup-needed-modal"; @import "screenshot-warning-model"; diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 100d730e1..0192e213f 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -32,9 +32,6 @@ font-size: .8rem; i { font-size: 1.3rem; - &.ion-social-bitcoin-outline { - border-right: 1px solid rgb(228, 228, 228); - } } } .bit-address { @@ -111,6 +108,10 @@ margin-bottom:1rem; } } + .receive-tab-bitcoin-icon { + border-right: 1px solid rgb(228, 228, 228); + padding-right: 10px; + } } @keyframes fadeIn { diff --git a/www/img/icon-bitcoin-symbol.svg b/www/img/icon-bitcoin-symbol.svg new file mode 100644 index 000000000..39d4cc30b --- /dev/null +++ b/www/img/icon-bitcoin-symbol.svg @@ -0,0 +1,13 @@ + + + diff --git a/www/views/includes/backupNeededPopup.html b/www/views/includes/backupNeededPopup.html index 693659d7b..02dd82d42 100644 --- a/www/views/includes/backupNeededPopup.html +++ b/www/views/includes/backupNeededPopup.html @@ -3,25 +3,11 @@
diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index 6f297171b..820687f82 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -56,7 +56,7 @@