+
-
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 007e5e747..92cc05557 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 */
@@ -171,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;
@@ -615,17 +624,20 @@ 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);
+::-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,
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,