mirror of https://github.com/BTCPrivate/copay.git
prelim styling of payment proposal modal
This commit is contained in:
parent
f1897f4d1b
commit
288d122b3d
|
@ -18,10 +18,20 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
$scope.color = $scope.wallet.color;
|
$scope.color = $scope.wallet.color;
|
||||||
$scope.data = {};
|
$scope.data = {};
|
||||||
$scope.hasClick = platformInfo.hasClick;
|
$scope.hasClick = platformInfo.hasClick;
|
||||||
|
$scope.displayAmount = getDisplayAmount(tx.amountStr);
|
||||||
|
$scope.displayUnit = getDisplayUnit(tx.amountStr);
|
||||||
initActionList();
|
initActionList();
|
||||||
checkPaypro();
|
checkPaypro();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getDisplayAmount(amountStr) {
|
||||||
|
return amountStr.split(' ')[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
function getDisplayUnit(amountStr) {
|
||||||
|
return amountStr.split(' ')[1];
|
||||||
|
}
|
||||||
|
|
||||||
function initActionList() {
|
function initActionList() {
|
||||||
$scope.actionList = [];
|
$scope.actionList = [];
|
||||||
|
|
||||||
|
|
|
@ -1,36 +1,58 @@
|
||||||
#txp-details{
|
#txp-details {
|
||||||
|
$item-lateral-padding: 20px;
|
||||||
|
$item-vertical-padding: 10px;
|
||||||
|
$item-border-color: #EFEFEF;
|
||||||
|
$item-label-color: #6C6C6E;
|
||||||
|
|
||||||
|
.wallet-color-header-bar {
|
||||||
|
border: 0;
|
||||||
|
background: none;
|
||||||
|
}
|
||||||
.slide-to-pay {
|
.slide-to-pay {
|
||||||
bottom: 100px;
|
bottom: 100px;
|
||||||
}
|
}
|
||||||
.head {
|
.head {
|
||||||
padding-bottom: 30px;
|
padding: 30px $item-lateral-padding 4rem;
|
||||||
.sending-label{
|
.sending-label {
|
||||||
line-height: 70px;
|
display: flex;
|
||||||
font-size: 25px;
|
font-size: 18px;
|
||||||
i {
|
align-items: center;
|
||||||
margin-left: 20px;
|
margin-bottom: 1.5rem;
|
||||||
}
|
|
||||||
span {
|
img {
|
||||||
margin-left: 15px;
|
margin-right: 1rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.amount-label{
|
.amount-label{
|
||||||
margin-left: 20px;
|
|
||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
.amount{
|
.amount{
|
||||||
font-size: 36px;
|
font-size: 38px;
|
||||||
|
margin-bottom: .5rem;
|
||||||
|
|
||||||
|
> .unit {
|
||||||
|
font-family: "Roboto-Light";
|
||||||
}
|
}
|
||||||
.alternative{
|
}
|
||||||
font-size: 18px;
|
.alternative {
|
||||||
font-weight: 200;
|
font-size: 16px;
|
||||||
color: grey;
|
font-family: "Roboto-Light";
|
||||||
|
color: #9B9B9B;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.info{
|
.info {
|
||||||
span {
|
span {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
.item {
|
||||||
|
border-color: $item-border-color;
|
||||||
|
padding: $item-vertical-padding $item-lateral-padding;
|
||||||
|
|
||||||
|
&__label {
|
||||||
|
font-size: 14px;
|
||||||
|
color: $item-label-color;
|
||||||
|
}
|
||||||
|
}
|
||||||
.payment-proposal-to {
|
.payment-proposal-to {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<svg width="34px" height="34px" viewBox="0 0 34 34" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||||
|
<!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
|
||||||
|
<title>Received</title>
|
||||||
|
<desc>Created with Sketch.</desc>
|
||||||
|
<defs></defs>
|
||||||
|
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||||
|
<g id="Icons/Transaction/Send" transform="translate(-7.000000, -8.000000)">
|
||||||
|
<g id="Icons/Send">
|
||||||
|
<g id="icons/received">
|
||||||
|
<g id="Received" transform="translate(24.244258, 24.883990) scale(-1, 1) rotate(-45.000000) translate(-24.244258, -24.883990) translate(7.244258, 7.883990)">
|
||||||
|
<path d="M17.3272285,33.991292 C26.4399269,33.991292 33.8272285,26.6039904 33.8272285,17.491292 C33.8272285,8.37859367 26.4399269,0.991292046 17.3272285,0.991292046 C8.21453012,0.991292046 0.82722849,8.37859367 0.82722849,17.491292 C0.82722849,26.6039904 8.21453012,33.991292 17.3272285,33.991292 Z" id="Oval-204" fill="#F2F2F2" opacity="0.8"></path>
|
||||||
|
<path d="M9.08046771,17.7310374 L25.550467,17.7310374 M15.140197,25.2788677 L7.74513693,17.8384337 L14.8830819,10.5152146" id="Line" stroke="#BEBEBE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" transform="translate(16.647802, 17.897041) scale(1, -1) rotate(-135.000000) translate(-16.647802, -17.897041) "></path>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.6 KiB |
|
@ -1,5 +1,5 @@
|
||||||
<ion-modal-view id="txp-details" ng-controller="txpDetailsController" ng-init="init()">
|
<ion-modal-view id="txp-details" ng-controller="txpDetailsController" ng-init="init()">
|
||||||
<ion-header-bar align-title="center" class="bar-royal" ng-style="{'background-color': wallet.color}">
|
<ion-header-bar align-title="center" class="bar-royal wallet-color-header-bar" ng-style="{'background-color': wallet.color}">
|
||||||
<button class="button button-clear" ng-click="close()">
|
<button class="button button-clear" ng-click="close()">
|
||||||
Close
|
Close
|
||||||
</button>
|
</button>
|
||||||
|
@ -15,11 +15,12 @@
|
||||||
<div class="list">
|
<div class="list">
|
||||||
<div class="item head">
|
<div class="item head">
|
||||||
<div class="sending-label">
|
<div class="sending-label">
|
||||||
<i class="icon ion-arrow-up-c"></i>
|
<!-- <i class="icon ion-arrow-up-c"></i> -->
|
||||||
|
<img src="img/sending-icon.svg">
|
||||||
<span translate>Sending</span>
|
<span translate>Sending</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="amount-label">
|
<div class="amount-label">
|
||||||
<div class="amount">{{tx.amountStr}}</div>
|
<div class="amount">{{displayAmount}} <span class="unit">{{displayUnit}}</span></div>
|
||||||
<div class="alternative" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
|
<div class="alternative" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -50,7 +51,7 @@
|
||||||
|
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<span translate>To</span>
|
<span class="item__label" translate>To</span>
|
||||||
<span class="payment-proposal-to" copy-to-clipboard="tx.toAddress">
|
<span class="payment-proposal-to" copy-to-clipboard="tx.toAddress">
|
||||||
<i class="icon ion-social-bitcoin"></i>
|
<i class="icon ion-social-bitcoin"></i>
|
||||||
<contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{tx.toAddress}}"></contact>
|
<contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{tx.toAddress}}"></contact>
|
||||||
|
@ -71,7 +72,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="item">
|
<div class="item">
|
||||||
{{'From'|translate}}
|
<span class="item__label" translate>From</span>
|
||||||
<span class="item-note">
|
<span class="item-note">
|
||||||
<i class="icon big-icon-svg right">
|
<i class="icon big-icon-svg right">
|
||||||
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
|
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
|
||||||
|
@ -80,7 +81,7 @@
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="item">
|
<div class="item">
|
||||||
{{'Created by'|translate}}
|
<span class="item__label" translate>Created by</span>
|
||||||
<span class="item-note">
|
<span class="item-note">
|
||||||
{{tx.creatorName}} <time>{{ (tx.ts || tx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
{{tx.creatorName}} <time>{{ (tx.ts || tx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
||||||
</span>
|
</span>
|
||||||
|
@ -92,7 +93,7 @@
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="item">
|
<div class="item">
|
||||||
{{'Fee'|translate}}
|
<span class="item__label" translate>Fee</span>
|
||||||
<span class="item-note">
|
<span class="item-note">
|
||||||
{{tx.feeStr}}
|
{{tx.feeStr}}
|
||||||
</span>
|
</span>
|
||||||
|
|
Loading…
Reference in New Issue