From d53f19bbbfff60d39e9bcbb0875aac24909f05c4 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Thu, 17 Nov 2016 11:13:41 -0500 Subject: [PATCH 1/3] feat(share): add brief entry animation for the sharing view --- src/sass/ionic.scss | 4 ---- src/sass/views/feedback/complete.scss | 21 ++++++++++++++++----- src/sass/views/feedback/rateApp.scss | 4 ++-- www/views/feedback/rateApp.html | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/sass/ionic.scss b/src/sass/ionic.scss index 22fef9a07..7e5a3a4d1 100644 --- a/src/sass/ionic.scss +++ b/src/sass/ionic.scss @@ -6,10 +6,6 @@ /* Ionic Overrides and Workarounds */ // Please include a description of the problem solved by the workaround. -// class to dynamically hide the ion-nav-bar for v1 Amazon flow -// Fix hide-nav-bar (true|false) -//ion-nav-bar.hide { display: block !important; } - // the ion tabs element never needs it's own background (backgrounds are // rendered by the tabs), and the default background would cover the scanner ion-tabs.ion-tabs-transparent { diff --git a/src/sass/views/feedback/complete.scss b/src/sass/views/feedback/complete.scss index 7a9fea4ca..2b0bdb91f 100644 --- a/src/sass/views/feedback/complete.scss +++ b/src/sass/views/feedback/complete.scss @@ -64,13 +64,13 @@ padding: 50px 10px 30px; background-color: $subtle-gray; text-align: center; - transition: transform .3s cubic-bezier(0.4, 0.0, 0.2, 1) .2s, opacity .5s ease-in .2s; transform: translateY(100%); opacity: 0; - &.slide-up { - transform: translateY(0); - opacity: 1; - } + animation-name: slideUpFadeIn; + animation-duration: .3s; + animation-fill-mode: forwards; + animation-timing-function: cubic-bezier(0.4, 0.0, 0.2, 1); + animation-delay: .2s; } .share-buttons__action { display: inline-block; @@ -81,3 +81,14 @@ margin-bottom: 20px; } } + +@keyframes slideUpFadeIn { + from { + transform: translateY(100%); + opacity: 0; + } + to { + transform: translateY(0); + opacity: 1; + } +} diff --git a/src/sass/views/feedback/rateApp.scss b/src/sass/views/feedback/rateApp.scss index 38153d17d..c484ccc19 100644 --- a/src/sass/views/feedback/rateApp.scss +++ b/src/sass/views/feedback/rateApp.scss @@ -28,11 +28,11 @@ padding: 10px 30px 20px 40px; color: #667; } - .buttons { + .rate-buttons { bottom: 0; width: 100%; position: absolute; background-color: $subtle-gray; - padding: 50px 0; + padding: 30px 0 15px; } } diff --git a/www/views/feedback/rateApp.html b/www/views/feedback/rateApp.html index 18481e0b3..e0d2774e8 100644 --- a/www/views/feedback/rateApp.html +++ b/www/views/feedback/rateApp.html @@ -9,7 +9,7 @@
Would you be willing to rate BitPay in the app store?
-
+
From 7c780e5e34f3d13342db5d13234682be2e91fa6c Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Thu, 17 Nov 2016 11:25:47 -0500 Subject: [PATCH 2/3] fix(receive): minor spacing and sizing improvements --- src/sass/views/tab-receive.scss | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 6743b1363..8a12420cf 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -278,7 +278,7 @@ .swiper-slide{ text-align: center; .card{ - margin-top:2vh; + margin-top: 1vh; display: inline-block; width:80%; @media(min-height: 1000px) and (max-width: 699px){ @@ -412,7 +412,7 @@ display: inline-block; &.wallet-name{ font-size:16px; - width: 70%; + width: 79%; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; @@ -425,8 +425,13 @@ visibility: visible !important; } } - .big-icon-svg{ - & > .bg{padding:.3rem;width: 40px;height:40px;} + .big-icon-svg { + padding: 0; + & > .bg { + padding:.3rem; + width: 40px; + height:40px; + } } } } From 53fd1c7cc862963668ba270b121fbad3ae0a227b Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Thu, 17 Nov 2016 12:05:06 -0500 Subject: [PATCH 3/3] fix(send): use a placeholder instead of an identicon for "add a contact" --- www/img/contact-placeholder.svg | 12 ++++++++++++ www/views/tab-send.html | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 www/img/contact-placeholder.svg diff --git a/www/img/contact-placeholder.svg b/www/img/contact-placeholder.svg new file mode 100644 index 000000000..f730da86b --- /dev/null +++ b/www/img/contact-placeholder.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/www/views/tab-send.html b/www/views/tab-send.html index b33e828e3..c4751bdf9 100644 --- a/www/views/tab-send.html +++ b/www/views/tab-send.html @@ -41,7 +41,7 @@
- + Add a Contact