From 1aa31b69352e49ba1207f9d68e346b1508028600 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Tue, 7 Aug 2018 16:36:33 +0900 Subject: [PATCH] egifter template, waiting the logo in svg. --- app-template/bitcoincom/css/bitcoin.com.css | 29 +++++++++++++-------- src/sass/views/review.scss | 2 +- www/css/bitcoin.com.css | 24 +++++++++++++---- www/css/main.css | 23 ++++++++++------ www/views/thirdparty/egifter-header.html | 3 +++ www/views/walletSelector.html | 3 ++- 6 files changed, 58 insertions(+), 26 deletions(-) create mode 100644 www/views/thirdparty/egifter-header.html diff --git a/app-template/bitcoincom/css/bitcoin.com.css b/app-template/bitcoincom/css/bitcoin.com.css index 19113dd2c..793276e25 100644 --- a/app-template/bitcoincom/css/bitcoin.com.css +++ b/app-template/bitcoincom/css/bitcoin.com.css @@ -264,15 +264,15 @@ div.onboarding-topic { height: 5em; } -.shapeshift-banner { - background: url(../img/shapeshiftbg.jpg) center center no-repeat #28394d; - padding: 10px; - box-shadow: 0px 5px 10px 0px #cccccc; - height: 5em; +.shapeshift-logo { + display: block; + float: left; + max-height: 100%; + max-width: 100%; } .bitpay-banner { - background: center center no-repeat #1A3A8B; + background: #1A3A8B; padding: 10px; box-shadow: 0px 5px 10px 0px #cccccc; height: 5em; @@ -285,9 +285,16 @@ div.onboarding-topic { height: 4em; } -.shapeshift-logo { - display: block; - float: left; - max-height: 100%; - max-width: 100%; +.egifter-banner { + background: #1A3A8B; + padding: 10px; + box-shadow: 0px 5px 10px 0px #cccccc; + height: 5em; +} + +.egifter-logo { + display: block; + max-height: 100%; + width: 100%; + height: 4em; } diff --git a/src/sass/views/review.scss b/src/sass/views/review.scss index 44b634697..79bca1896 100644 --- a/src/sass/views/review.scss +++ b/src/sass/views/review.scss @@ -11,7 +11,7 @@ bottom: 92px; } - .shapeshift-banner, .bitpay-banner { + .shapeshift-banner, .bitpay-banner, .egifter-banner { box-shadow: none; } diff --git a/www/css/bitcoin.com.css b/www/css/bitcoin.com.css index 59e503ac7..0cb170440 100644 --- a/www/css/bitcoin.com.css +++ b/www/css/bitcoin.com.css @@ -314,6 +314,13 @@ div.slide-success__background.fill-screen { height: 5em; } +.shapeshift-logo { + display: block; + float: left; + max-height: 100%; + max-width: 100%; +} + .bitpay-banner { background: #1A3A8B; padding: 10px; @@ -328,9 +335,16 @@ div.slide-success__background.fill-screen { height: 4em; } -.shapeshift-logo { - display: block; - float: left; - max-height: 100%; - max-width: 100%; +.egifter-banner { + background: #1A3A8B; + padding: 10px; + box-shadow: 0px 5px 10px 0px #cccccc; + height: 5em; +} + +.egifter-logo { + display: block; + max-height: 100%; + width: 100%; + height: 4em; } diff --git a/www/css/main.css b/www/css/main.css index 87333d1a6..350d5bbce 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -15262,8 +15262,10 @@ log-options #check-bar .checkbox-icon { #view-review .fee-summary { position: absolute; bottom: 92px; } - #view-review .shapeshift-banner, #view-review .bitpay-banner { + #view-review .shapeshift-banner, #view-review .bitpay-banner, #view-review .egifter-banner { box-shadow: none; } + #view-review .warning { + color: #b7664d; } .gravatar { border-radius: 3px; @@ -15410,7 +15412,7 @@ ion-content.padded-bottom-cta-with-summary { .fee-summary { position: relative; display: flex; - justify-content: space-between; + flex-direction: column; width: 100%; padding: 5px 12px 15px; box-sizing: border-box; @@ -15423,12 +15425,17 @@ ion-content.padded-bottom-cta-with-summary { width: 100%; height: 15px; background: linear-gradient(to bottom, rgba(242, 242, 242, 0) 0%, #f2f2f2 100%); } - .fee-summary .fee-fiat.positive { - color: #70955F; } - .fee-summary .fee-fiat.negative { - color: #C24633; } - .fee-summary .fee-crypto { - color: #A7A7A7; } + .fee-summary .amount { + display: flex; + flex-direction: row; + justify-content: space-between; + width: 100%; } + .fee-summary .amount .fee-fiat.positive { + color: #70955F; } + .fee-summary .amount .fee-fiat.negative { + color: #C24633; } + .fee-summary .amount .fee-crypto { + color: #A7A7A7; } .amount .start, .amount .middle, diff --git a/www/views/thirdparty/egifter-header.html b/www/views/thirdparty/egifter-header.html new file mode 100644 index 000000000..97d38603f --- /dev/null +++ b/www/views/thirdparty/egifter-header.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/www/views/walletSelector.html b/www/views/walletSelector.html index eeb7591a8..b375ddb8c 100644 --- a/www/views/walletSelector.html +++ b/www/views/walletSelector.html @@ -5,7 +5,8 @@
-
+
+
Paying
{{requestAmount}} {{requestCurrency}}