prelim send screen styling

This commit is contained in:
Marty Alcala 2016-10-12 11:45:11 -04:00
commit 702697a9dc
6 changed files with 119 additions and 36 deletions

View file

@ -40,6 +40,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.toAmount = parseInt($scope.toAmount);
$scope.amountStr = txFormatService.formatAmountStr($scope.toAmount);
$scope.displayAmount = getDisplayAmount($scope.amountStr);
$scope.displayUnit = getDisplayUnit($scope.amountStr);
var networkName = (new bitcore.Address($scope.toAddress)).network.name;
$scope.network = networkName;
@ -75,6 +77,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
if (++index == wallets.length) {
if (!lodash.isEmpty(filteredWallets)) {
$scope.wallets = lodash.clone(filteredWallets);
setWallet($scope.wallets[0]);
} else {
if (!enoughFunds)
@ -123,6 +126,14 @@ angular.module('copayApp.controllers').controller('confirmController', function(
});
};
function getDisplayAmount(amountStr) {
return amountStr.split(' ')[0];
}
function getDisplayUnit(amountStr) {
return amountStr.split(' ')[1];
}
var setFromPayPro = function(uri, cb) {
if (!cb) cb = function() {};

View file

@ -986,7 +986,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
profileService.storeProfileIfDirty();
$log.debug('Profile loaded ... Starting UX.');
scannerService.gentleInitialize();
$state.go('tabs.home');
//$state.go('tabs.home');
}
});
});

View file

@ -19,7 +19,8 @@ $button-secondary-border: transparent;
$button-secondary-active-bg: darken($subtle-gray, 5%);
$button-secondary-active-border: transparent;
%button-standard {
%button-standard,
click-to-accept {
width: 85%;
max-width: 300px;
margin-left: auto;

View file

@ -1,30 +1,30 @@
#view-confirm {
.icon-bitpay-card {
background-image: url("../img/icon-bitpay.svg");
}
.slide-to-pay{
bottom: 149px;
}
.send-gravatar {
left: 11px;
position: absolute;
top: 10px;
}
.accept-slide {
position: fixed;
bottom: 0;
width: 100%;
height: 100px;
background-color: #647CE8;
color: #ffffff;
font-size: 25px;
text-align: center;
padding-top: 34px;
line-height: 32px;
}
.accept-slide i {
float: right;
font-size: 32px;
margin-right: 20px;
}
}
// #view-confirm {
// .icon-bitpay-card {
// background-image: url("../img/icon-bitpay.svg");
// }
// .slide-to-pay{
// bottom: 92px;
// }
// .send-gravatar {
// left: 11px;
// position: absolute;
// top: 10px;
// }
// .accept-slide {
// position: fixed;
// bottom: 0;
// width: 100%;
// height: 100px;
// background-color: #647CE8;
// color: #ffffff;
// font-size: 25px;
// text-align: center;
// padding-top: 34px;
// line-height: 32px;
// }
// .accept-slide i {
// float: right;
// font-size: 32px;
// margin-right: 20px;
// }
// }

View file

@ -1,4 +1,5 @@
#txp-details {
#txp-details,
#view-confirm {
$item-lateral-padding: 20px;
$item-vertical-padding: 10px;
$item-border-color: #EFEFEF;
@ -8,7 +9,7 @@
background: #f5f5f5;
}
.slide-to-pay {
bottom: 100px;
bottom: 92px;
}
.head {
padding: 30px $item-lateral-padding 4rem;