From 390a7deecffaf1853694cabe714311a8967a7209 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Tue, 13 Sep 2016 15:45:56 -0400 Subject: [PATCH 1/3] finish adding styles for push notifications view(initial testing for iPhone5 size devices only) --- public/img/onboarding-push-notifications.svg | 37 +++++++++++++++++++ public/views/onboarding/notifications.html | 25 ++++++++----- src/js/controllers/onboarding/collectEmail.js | 2 +- .../onboard-push-notifications.scss | 37 +++++++++++++++++++ src/sass/views/onboarding/onboarding.scss | 6 +++ 5 files changed, 96 insertions(+), 11 deletions(-) create mode 100644 public/img/onboarding-push-notifications.svg create mode 100644 src/sass/views/onboarding/onboard-push-notifications.scss diff --git a/public/img/onboarding-push-notifications.svg b/public/img/onboarding-push-notifications.svg new file mode 100644 index 000000000..4c6899861 --- /dev/null +++ b/public/img/onboarding-push-notifications.svg @@ -0,0 +1,37 @@ + + + + Group 7 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/views/onboarding/notifications.html b/public/views/onboarding/notifications.html index d086b1355..b60984f48 100644 --- a/public/views/onboarding/notifications.html +++ b/public/views/onboarding/notifications.html @@ -1,16 +1,21 @@ - + -
-

+
+

Push Notifications -

- - +

+
+
+

Would you like to receive push notifications about payments? - - - - +

+
+
+
+
+ + +
diff --git a/src/js/controllers/onboarding/collectEmail.js b/src/js/controllers/onboarding/collectEmail.js index 6479e0ea8..14ec1e52a 100644 --- a/src/js/controllers/onboarding/collectEmail.js +++ b/src/js/controllers/onboarding/collectEmail.js @@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('collectEmailController', func var isCordova = platformInfo.isCordova; var isWP = platformInfo.isWP; - var usePushNotifications = isCordova && !isWP; + var usePushNotifications = true; var wallet = profileService.getWallet($stateParams.walletId); var walletId = wallet.credentials.walletId; diff --git a/src/sass/views/onboarding/onboard-push-notifications.scss b/src/sass/views/onboarding/onboard-push-notifications.scss new file mode 100644 index 000000000..3183291a0 --- /dev/null +++ b/src/sass/views/onboarding/onboard-push-notifications.scss @@ -0,0 +1,37 @@ +#onboarding-push-notifications{ + h2{ + margin-top:2rem; + } + #cta{ + background-image: url('../img/onboarding-push-notifications.svg'); + height: 15rem; + margin-top: .75rem; + } + .cta-buttons{ + float:none; + bottom:0; + position: absolute; + width:100%; + button{ + max-width: 400px; + } + } +} + +@media (max-width: 400px){ + #onboarding-push-notifications{ + .cta-buttons{ + float:none; + bottom:0; + position: absolute; + } + } +} +@media (max-height: 540px){ + #onboarding-push-notifications{ + .cta-buttons{ + float:left; + position: relative; + } + } +} \ No newline at end of file diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss index c84b0e3df..04fa87401 100644 --- a/src/sass/views/onboarding/onboarding.scss +++ b/src/sass/views/onboarding/onboarding.scss @@ -48,6 +48,7 @@ } } button { + color:#fff; &.next-slide { background: rgba(215, 215, 215, 0.10); } @@ -67,8 +68,12 @@ .button-transparent{ background: none !important; } + .button-translucent{ + background: rgba(215, 215, 215, 0.1) + } .button-primary{ background: rgb(100, 124, 232) !important; + color:#fff; } .light-blue{ color:rgb(100, 124, 232); @@ -98,3 +103,4 @@ @import "onboard-backup-request"; @import "onboard-backup-warning"; @import "onboard-disclaimer"; +@import "onboard-push-notifications"; From 4a1ea6d3eadd0d11dc8db237156d3ae6e46294a6 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Tue, 13 Sep 2016 15:55:08 -0400 Subject: [PATCH 2/3] updating on boarding button classes on tour page --- public/views/onboarding/tour.html | 4 ++-- src/sass/views/onboarding/onboarding.scss | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/public/views/onboarding/tour.html b/public/views/onboarding/tour.html index d4be4de4a..474a203aa 100644 --- a/public/views/onboarding/tour.html +++ b/public/views/onboarding/tour.html @@ -31,7 +31,7 @@

-
@@ -55,7 +55,7 @@

-
diff --git a/src/sass/views/onboarding/onboarding.scss b/src/sass/views/onboarding/onboarding.scss index 04fa87401..4ca9842a2 100644 --- a/src/sass/views/onboarding/onboarding.scss +++ b/src/sass/views/onboarding/onboarding.scss @@ -49,9 +49,6 @@ } button { color:#fff; - &.next-slide { - background: rgba(215, 215, 215, 0.10); - } } } .col { From df30370e6705013d91d446b88cc0be4d6192fcea Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 14 Sep 2016 11:40:04 -0400 Subject: [PATCH 3/3] removed cat margin bottom at certain height --- src/sass/views/onboarding/onboard-push-notifications.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sass/views/onboarding/onboard-push-notifications.scss b/src/sass/views/onboarding/onboard-push-notifications.scss index 3183291a0..1132317e7 100644 --- a/src/sass/views/onboarding/onboard-push-notifications.scss +++ b/src/sass/views/onboarding/onboard-push-notifications.scss @@ -29,6 +29,9 @@ } @media (max-height: 540px){ #onboarding-push-notifications{ + #cta{ + margin-bottom: 0; + } .cta-buttons{ float:left; position: relative;