From a8f6b3c27dda877b36b2037f866ec91a268e3499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 16 Sep 2016 14:40:55 -0300 Subject: [PATCH] add news and updates checkbox in onboarding --- public/views/onboarding/collectEmail.html | 5 +- public/views/onboarding/disclaimer.html | 2 +- src/js/controllers/onboarding/collectEmail.js | 3 +- .../onboarding/onboard-collect-email.scss | 57 ++++++++++++++++--- 4 files changed, 56 insertions(+), 11 deletions(-) diff --git a/public/views/onboarding/collectEmail.html b/public/views/onboarding/collectEmail.html index d5d9babda..2626440fd 100644 --- a/public/views/onboarding/collectEmail.html +++ b/public/views/onboarding/collectEmail.html @@ -14,9 +14,12 @@
+ + Get news and updates from Bitpay +
diff --git a/public/views/onboarding/disclaimer.html b/public/views/onboarding/disclaimer.html index 4d9887bc9..9d8b59a5e 100644 --- a/public/views/onboarding/disclaimer.html +++ b/public/views/onboarding/disclaimer.html @@ -8,7 +8,7 @@ Bitcoin is different - it cannot be safely held with a bank or web service

- + I understand my funds are held securely on this device, not by a company. I understand if this wallet is lost or deleted, my bitcoin can only be recovered with the backup phrase. diff --git a/src/js/controllers/onboarding/collectEmail.js b/src/js/controllers/onboarding/collectEmail.js index e00aaa098..0a32fb454 100644 --- a/src/js/controllers/onboarding/collectEmail.js +++ b/src/js/controllers/onboarding/collectEmail.js @@ -9,13 +9,14 @@ angular.module('copayApp.controllers').controller('collectEmailController', func var wallet = profileService.getWallet($stateParams.walletId); var walletId = wallet.credentials.walletId; + $scope.data = {}; + $scope.data.accept = false; $scope.save = function() { var opts = { emailFor: {} }; opts.emailFor[walletId] = $scope.email; - walletService.updateRemotePreferences(wallet, { email: $scope.email, }, function(err) { diff --git a/src/sass/views/onboarding/onboard-collect-email.scss b/src/sass/views/onboarding/onboard-collect-email.scss index ad0be19fb..b1c943bd6 100644 --- a/src/sass/views/onboarding/onboard-collect-email.scss +++ b/src/sass/views/onboarding/onboard-collect-email.scss @@ -46,18 +46,59 @@ z-index: 5; margin-top: 0; width: 100%; - label { - background: rgba(200, 200, 200, 0.20); - height: 3rem; - margin-top:0; - i { - position: absolute; - right: 3%; - top: 1rem; + form { + label { + background: rgba(200, 200, 200, 0.20); + height: 3rem; + margin-top:0; + i { + position: absolute; + right: 3%; + top: 1rem; + } } } } + .item { + border: none; + label{ + background: none; + } + .checkbox input:before, + .checkbox .checkbox-icon:before { + border-radius: 50% !important; + background: none; + border-width: 2px; + padding: .9rem; + position: relative; + left: -7px; + top: -8px; + } + .checkbox input:checked:after, + input:checked + .checkbox-icon:after { + border-color: rgb(19, 229, 182); + top:20%; + left:11%; + } + .item-content { + width: 90%; + margin-left: 10%; + } + } + .item-checkbox .checkbox { + margin-left: 10%; + top: 55%; + } + .checkbox input:before, + .checkbox .checkbox-icon:before{ + border-color:$soft-blue; + } + .checkbox input:checked:before, + .checkbox input:checked + .checkbox-icon:before { + border-color: rgb(19, 229, 182); + } } + @media (min-width: 1000px){ #onboarding-collect-email{ #collect-email{