From ea14fa3d97d5c83abad64d0b04c207a34159fe1f Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 13 Apr 2015 17:03:43 -0300 Subject: [PATCH 1/5] Fix placeholder for wp8 --- public/views/send.html | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/public/views/send.html b/public/views/send.html index 95e3e6d95..808dee267 100644 --- a/public/views/send.html +++ b/public/views/send.html @@ -27,7 +27,7 @@
-
+
@@ -67,10 +67,7 @@
- - +
@@ -105,7 +102,7 @@
@@ -113,7 +110,7 @@ @@ -127,12 +124,12 @@
From 8fdb24652f15078d32f4f863c8f30af84a4a8ca6 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 13 Apr 2015 23:38:28 -0300 Subject: [PATCH 2/5] Fixes unexpected UX behavior on WP8.1 --- public/index.html | 2 +- public/views/send.html | 11 +++-------- src/css/mobile.css | 13 ------------- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/public/index.html b/public/index.html index b03b75e9c..7ad7f249b 100644 --- a/public/index.html +++ b/public/index.html @@ -38,7 +38,7 @@
diff --git a/public/views/send.html b/public/views/send.html index 808dee267..6f6561fe3 100644 --- a/public/views/send.html +++ b/public/views/send.html @@ -123,12 +123,7 @@ too long!
- -
@@ -142,13 +137,13 @@
-
+
-
+ diff --git a/src/css/mobile.css b/src/css/mobile.css index 007e5e747..8c1f25e83 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -615,19 +615,6 @@ a.pin-button:active { padding-top: 1rem; } -.animation { - position: absolute; - background: #fff; - display: block; - width: 100%; - height: 100%; - top: 0; - left: 0; - -webkit-backface-visibility: hidden; - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); -} - .animation-left.ng-enter, .animation-left.ng-leave, .animation-right.ng-enter, .animation-right.ng-leave { -webkit-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 250ms; From acb5eec98b9fd8e918663f69eb2f874ebb922974 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 14 Apr 2015 01:15:18 -0300 Subject: [PATCH 3/5] Fix Layout for wp8. Fix placeholder for inputs --- cordova/wp/MainPage.xaml | 4 ++-- public/index.html | 2 +- src/css/main.css | 23 +---------------------- src/css/mobile.css | 22 +++++++++++++++++++++- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/cordova/wp/MainPage.xaml b/cordova/wp/MainPage.xaml index 10a9fbbd3..5ce3fa006 100644 --- a/cordova/wp/MainPage.xaml +++ b/cordova/wp/MainPage.xaml @@ -31,13 +31,13 @@ SupportedOrientations="Portrait" Orientation="Portrait" shell:SystemTray.IsVisible="True" d:DesignHeight="768" d:DesignWidth="480" xmlns:my="clr-namespace:WPCordovaClassLib"> - + diff --git a/public/index.html b/public/index.html index 7ad7f249b..ddf8e7753 100644 --- a/public/index.html +++ b/public/index.html @@ -3,7 +3,7 @@ - + diff --git a/src/css/main.css b/src/css/main.css index 812a0e88f..16e9b9202 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -7,27 +7,6 @@ color: #2C3E50; } -body, div, .row { - -webkit-overflow-scrolling: touch; -}; - -::-webkit-input-placeholder { - color: #B7C2CD; -} - -:-moz-placeholder { /* Firefox 18- */ - color: #B7C2CD; -} - -::-moz-placeholder { /* Firefox 19+ */ - color: #B7C2CD; -} - -:-ms-input-placeholder { - color: #B7C2CD; -} - - #qr-canvas { display: none; } #qrcode-scanner-video { display: block; @@ -526,7 +505,7 @@ input { } input[type=date], input[type=datetime-local], input[type=datetime], input[type=email], input[type=month], input[type=number], input[type=password], input[type=search], input[type=tel], input[type=text], input[type=time], input[type=url], input[type=week], textarea { - color: #2C3E50; + color: #B7C2CD; margin-bottom: 1.5rem; height: 35px; background: transparent; diff --git a/src/css/mobile.css b/src/css/mobile.css index 8c1f25e83..8a6c707c9 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -28,6 +28,10 @@ input { user-drag: none; } +body, div, .row { + -webkit-overflow-scrolling: touch; +} + .enable_text_select { -webkit-user-select: text; -khtml-user-select: text; @@ -44,7 +48,7 @@ input { body { overflow: hidden; - -ms-content-zooming: none; + -ms-content-zooming: none; } /* Fix IE 10 */ @@ -615,6 +619,22 @@ a.pin-button:active { padding-top: 1rem; } +::-webkit-input-placeholder { + color: #B7C2CD; +} + +:-moz-placeholder { /* Firefox 18- */ + color: #B7C2CD; +} + +::-moz-placeholder { /* Firefox 19+ */ + color: #B7C2CD; +} + +:-ms-input-placeholder { + color: #B7C2CD; +} + .animation-left.ng-enter, .animation-left.ng-leave, .animation-right.ng-enter, .animation-right.ng-leave { -webkit-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 250ms; From d3107f2460bba5e9bb2394fc22f16b8e40ec1c10 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 14 Apr 2015 01:15:37 -0300 Subject: [PATCH 4/5] Disable animation for main menu --- src/js/routes.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/js/routes.js b/src/js/routes.js index 844da9c3a..9915657b0 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -466,10 +466,10 @@ angular } var pageWeight = { - walletHome: 10, - receive: 20, - send: 30, - history: 40, + walletHome: 0, + receive: 0, + send: 0, + history: 0, preferences: 11, preferencesColor: 12, backup: 12, @@ -477,7 +477,7 @@ angular preferencesUnit: 12, preferencesAltCurrency: 12, preferencesBwsUrl: 12, - add: 11, + add: 0, create: 12, join: 12, import: 12, From 959cd57fe188c979286aa8df27a99e172c3cf1eb Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 14 Apr 2015 02:13:05 -0300 Subject: [PATCH 5/5] Fix layout after open the wallet. fix send button --- cordova/wp/MainPage.xaml | 4 ++-- public/index.html | 3 +-- public/views/receive.html | 2 +- public/views/send.html | 7 +++---- src/css/mobile.css | 5 +++++ 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cordova/wp/MainPage.xaml b/cordova/wp/MainPage.xaml index 5ce3fa006..10a9fbbd3 100644 --- a/cordova/wp/MainPage.xaml +++ b/cordova/wp/MainPage.xaml @@ -31,13 +31,13 @@ SupportedOrientations="Portrait" Orientation="Portrait" shell:SystemTray.IsVisible="True" d:DesignHeight="768" d:DesignWidth="480" xmlns:my="clr-namespace:WPCordovaClassLib"> - + diff --git a/public/index.html b/public/index.html index ddf8e7753..cd27bc35e 100644 --- a/public/index.html +++ b/public/index.html @@ -37,8 +37,7 @@
diff --git a/public/views/receive.html b/public/views/receive.html index eb967c30d..3591a09e3 100644 --- a/public/views/receive.html +++ b/public/views/receive.html @@ -26,7 +26,7 @@
-
+
Generating a new address... diff --git a/public/views/send.html b/public/views/send.html index 6f6561fe3..ae8f374f0 100644 --- a/public/views/send.html +++ b/public/views/send.html @@ -137,15 +137,14 @@
-
+
-
- Cancel +
+ Cancel
diff --git a/src/css/mobile.css b/src/css/mobile.css index 8a6c707c9..92cc05557 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -175,6 +175,11 @@ _:-ms-fullscreen, :root .main { height:100%; } +.home-wallet { + height: 100%; + background-color: #fff; +} + .home-wallet .avatar-wallet { padding: 1.7rem 1rem; width: 75px;