diff --git a/src/css/ionic-migration.css b/src/css/ionic-migration.css
index ee71cad73..8d25ca3ff 100644
--- a/src/css/ionic-migration.css
+++ b/src/css/ionic-migration.css
@@ -16,6 +16,10 @@
display: inherit;
}
+.behind {
+ z-index: -1;
+}
+
.bct {
background-color: transparent !important;
margin-top: -25px;
@@ -67,10 +71,6 @@ button, .button {
padding: 0;
}
-.scroll-view {
- height: 100% !important;
-}
-
/* Override the default modal size for large devices */
@media (min-width: 680px) {
.modal {
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index f98f3d1c4..0586594d9 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -33,7 +33,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var vanillaScope = ret;
$scope.collapseBalanceContent = function(updating) {
- if (updating) return;
+ if (updating || isCordova) return;
var scrollPosition = $ionicScrollDelegate.$getByHandle('transactions').getScrollPosition().top;
$scope.shouldCollapse = scrollPosition > 50 ? true : false;
@@ -44,10 +44,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
};
$scope.freezeScroll = function() {
- var scrollPosition = $ionicScrollDelegate.$getByHandle('balance').getScrollPosition().top;
var openRatio = $ionicSideMenuDelegate.getOpenRatio();
- if (scrollPosition < -75 || openRatio != 0)
+ if (openRatio != 0)
$ionicScrollDelegate.$getByHandle('balance').freezeScroll(true);
else
$ionicScrollDelegate.$getByHandle('balance').freezeScroll(false);
diff --git a/src/sass/main.scss b/src/sass/main.scss
index fd498079f..88b767055 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -460,8 +460,12 @@ ul.manage li {
}
}
-.fade {
- transition: margin-top .2s ease;
+.fade-t {
+ transition: top .2s ease;
+}
+
+.fade-all {
+ transition: .4s all ease;
}
.dn {
@@ -624,14 +628,6 @@ ul.manage li {
margin-top: 20px;
}
-.m50t {
- margin-top: 50px;
-}
-
-.m150t {
- margin-top: 150px;
-}
-
.m20tp {
margin-top: 20%;
}
@@ -640,6 +636,14 @@ ul.manage li {
margin-top: 30%;
}
+.t50 {
+ top: 50px;
+}
+
+.t150 {
+ top: 150px;
+}
+
.m15 {
margin: 15px;
}
@@ -1581,7 +1585,6 @@ input.ng-invalid-match {
color: #fff;
height: 150px;
margin-bottom: 25px;
- transition: .4s all ease;
}
.amountcollapsed {
@@ -1589,7 +1592,6 @@ input.ng-invalid-match {
text-align: center;
color: #fff;
height: 50px;
- transition: .4s all ease;
}
.alternative-amount {