diff --git a/src/js/controllers/feedback/sendFeedback.js b/src/js/controllers/feedback/sendFeedback.js index d26b2e2ff..d33c755e9 100644 --- a/src/js/controllers/feedback/sendFeedback.js +++ b/src/js/controllers/feedback/sendFeedback.js @@ -5,23 +5,23 @@ angular.module('copayApp.controllers').controller('sendFeedbackController', func switch ($scope.score) { case 1: $scope.reaction = gettextCatalog.getString("Ouch!"); - $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong. Is there anything we could do to improve your experience?"); + $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong."); break; case 2: $scope.reaction = gettextCatalog.getString("Oh no!"); - $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong. Is there anything we could do to improve your experience?"); + $scope.comment = gettextCatalog.getString("There's obviously something we're doing wrong."); break; case 3: $scope.reaction = gettextCatalog.getString("Thanks!"); - $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet. Is there anything we could do to improve your experience?"); + $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet."); break; case 4: $scope.reaction = gettextCatalog.getString("Thanks!"); - $scope.comment = gettextCatalog.getString("That's exciting to hear. We'd love to earn that fifth star from you - how could we improve your experience?"); + $scope.comment = gettextCatalog.getString("That's exciting to hear. We'd love to earn that fifth star from you"); break; case 5: $scope.reaction = gettextCatalog.getString("Feedback!"); - $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet. Is there anything we could do to improve your experience?"); + $scope.comment = gettextCatalog.getString("We're always looking for ways to improve BitPay wallet."); break; } diff --git a/src/sass/views/feedback/rateAppStore.scss b/src/sass/views/feedback/rateAppStore.scss index a393477bf..5003e6b02 100644 --- a/src/sass/views/feedback/rateAppStore.scss +++ b/src/sass/views/feedback/rateAppStore.scss @@ -1,12 +1,27 @@ #rate-app-store { + background-color: #ffffff; + .skip { + margin: 10px; + color: #667; + } .title { font-size: 20px; font-weight: bold; color: $dark-gray; - margin: 20px 10px; + margin: 40px 10px; text-align: center; } .subtitle { padding: 10px 30px 20px 40px; } + .buttons { + bottom: 0; + width: 100%; + position: absolute; + background-color: $subtle-gray; + .button { + margin-top: 40px; + margin-bottom: 30px; + } + } } diff --git a/src/sass/views/feedback/sendFeedBack.scss b/src/sass/views/feedback/sendFeedBack.scss index 9c8ea6295..8e3060984 100644 --- a/src/sass/views/feedback/sendFeedBack.scss +++ b/src/sass/views/feedback/sendFeedBack.scss @@ -1,22 +1,25 @@ #send-feedback { - background-color: #fff; + background-color: #ffffff; + .skip { + margin: 10px; + color: #667; + } .title { font-size: 20px; font-weight: bold; color: $dark-gray; - margin: 20px 10px; + margin-left: 10px; } .star { - margin: 20px 0px; - } - a { - font-size: 25px; - padding: 12px; - .gold { - color: #ffd700 !important; - } - .grey { - color: #667 !important; + a { + font-size: 25px; + padding: 12px; + .gold { + color: #ffd700; + } + .subtle-gray { + color: $subtle-gray; + } } } .comment { @@ -27,7 +30,8 @@ color: $dark-gray; } textarea { - padding: 10px; + border-top: 1px solid $subtle-gray; + padding: 20px; width: 100%; } } diff --git a/src/sass/views/feedback/thanks.scss b/src/sass/views/feedback/thanks.scss index 2a92e173b..bd4d3ccab 100644 --- a/src/sass/views/feedback/thanks.scss +++ b/src/sass/views/feedback/thanks.scss @@ -1,4 +1,15 @@ #thanks-feedback { + background-color: #ffffff; + .item-heading { + border-style: none; + margin-top: 5px; + a { + color: $dark-gray; + } + i { + font-size: 40px; + } + } .title { font-size: 20px; font-weight: bold; @@ -9,15 +20,21 @@ .subtitle { padding: 10px 30px 20px 40px; } - .row { - margin: 20px 0px 20px; - span { - margin-top: 15px; - display: block; - } - div { - text-align: center; - width: 100%; + .share-buttons { + bottom: 0; + width: 100%; + position: absolute; + background-color: $subtle-gray; + .row { + margin: 20px 0px 20px; + span { + margin-top: 15px; + display: block; + } + div { + text-align: center; + width: 100%; + } } } } diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index 0479a2d75..6e1314294 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -118,21 +118,24 @@ position: absolute; } } - .starts { + .stars { display: flex; border-bottom: none; .button { background-color: #fff; - width: 100%; + outline: none; + border: none; + height:10px; + width:10px; } .gold { - color: #ffd700 !important; + color: #ffd700; } - .grey { - color: #667 !important; + .subtle-gray { + color: $subtle-gray; } } - .continue-button { + .feedback-flow-button { padding: 20px; } } diff --git a/www/views/feedback/rateAppStore.html b/www/views/feedback/rateAppStore.html index eca714e32..3da6ed36b 100644 --- a/www/views/feedback/rateAppStore.html +++ b/www/views/feedback/rateAppStore.html @@ -1,12 +1,6 @@ - - - - - +
Thank you!
@@ -19,13 +13,13 @@ 5-star ratings help us get BitPay Wallet into more hands, and more users means more resoucers can be committed to the app!
- Would you be willing to rate BitPay Wallet in the app store? + Would you be willing to rate BitPay Wallet in the app store?
-
+
-
diff --git a/www/views/feedback/sendFeedback.html b/www/views/feedback/sendFeedback.html index 23a1e2150..e240d50d6 100644 --- a/www/views/feedback/sendFeedback.html +++ b/www/views/feedback/sendFeedback.html @@ -1,29 +1,23 @@ - - - - - +
-
+
{{reaction}}
-
- - - - - +
+ + + + +
{{comment}}
- +
- - +
+ +
Invite friends to BitPay Wallet!
@@ -34,7 +31,7 @@ Share the love by inviting your friends.
-
+