mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #2623 from bechi/layout-details-11
Layout details 11
This commit is contained in:
commit
3f605b37dd
|
@ -1,17 +1,15 @@
|
|||
<div
|
||||
<div
|
||||
class="bottom-bar row collapse">
|
||||
<div class="medium-3 small-3 columns text-center bottombar-item" ng-repeat="item in index.menu">
|
||||
<a ng-click="index.setTab(item.link)" ng-class="{'active': index.tab == item.link}"
|
||||
ng-style="{'border-top-color':index.tab==item.link ? index.backgroundColor : ''}">
|
||||
<i class="size-36 {{item.icon}} db"></i>
|
||||
<a ng-click="index.setTab(item.link)" ng-class="{'active': index.tab == item.link}">
|
||||
<i class="size-36 {{item.icon}} db"></i>
|
||||
<div class="size-10 tu">
|
||||
{{item.title|translate}}
|
||||
<span
|
||||
class="label alert round"
|
||||
{{item.title|translate}}
|
||||
<span
|
||||
class="label alert round"
|
||||
ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">{{index.pendingTxProposalsCountForUs}}</span>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
<div class="p45t" ng-init="updateCopayerList()">
|
||||
<h4 class="title m0" translate>Information</h4>
|
||||
<ul class="no-bullet size-14 m0">
|
||||
<li class="line-b p10">
|
||||
<li class="line-b p10 oh">
|
||||
<span class="text-gray" translate>To</span>:
|
||||
<span class="right">{{tx.toAddress}}</span>
|
||||
</li>
|
||||
<li class="line-b p10">
|
||||
<span class="text-gray" translate>Amount</span>:
|
||||
<span class="right">{{amountStr}}
|
||||
<span class="right">{{amountStr}}
|
||||
<span class="label gray radius">{{alternativeAmountStr}}</span>
|
||||
</span>
|
||||
</li>
|
||||
|
@ -44,7 +44,7 @@
|
|||
<li class="line-b p10">
|
||||
<span class="text-gray" translate>To</span>:
|
||||
<span class="right">
|
||||
<span>
|
||||
<span>
|
||||
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.paypro.domain}}</span>
|
||||
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.paypro.domain}}</span>
|
||||
</span>
|
||||
|
@ -87,32 +87,32 @@
|
|||
|
||||
<div class="row column m20t text-center text-warning" ng-if="tx.removed" translate>
|
||||
The transaction was removed by creator
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row m20t" ng-if="tx.pendingForUs">
|
||||
<div class="large-5 medium-5 small-6 columns">
|
||||
<button class="button outline dark-gray m0 expand" ng-click="reject(tx);"
|
||||
<button class="button outline dark-gray m0 expand" ng-click="reject(tx);"
|
||||
ng-disabled="loading">
|
||||
<i class="fi-x"></i>
|
||||
<i class="fi-x"></i>
|
||||
<span translate>Reject</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="large-5 medium-5 small-6 columns text-right">
|
||||
<button class="button primary m0 expand" ng-click="sign(tx)"
|
||||
ng-style="{'background-color':color}"
|
||||
<button class="button primary m0 expand" ng-click="sign(tx)"
|
||||
ng-style="{'background-color':color}"
|
||||
ng-disabled="loading">
|
||||
<i class="fi-check"></i>
|
||||
<i class="fi-check"></i>
|
||||
<span translate>Sign</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="text-center text-gray" ng-show="tx.status != 'pending'">
|
||||
<div class="m10t"
|
||||
<div class="m10t"
|
||||
ng-show="tx.status=='accepted'" translate>
|
||||
Transaction accepted...
|
||||
</div>
|
||||
<div class="m10t"
|
||||
<div class="m10t"
|
||||
ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
|
||||
<div translate>But not broadcasted. Try to send manually</div>
|
||||
<button class="primary"
|
||||
|
@ -121,7 +121,7 @@
|
|||
<span translate>Broadcast Transaction</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="text-success m10t"
|
||||
<div class="text-success m10t"
|
||||
ng-show="tx.status=='broadcasted'" translate>
|
||||
Transaction sent!
|
||||
</div>
|
||||
|
@ -132,9 +132,9 @@
|
|||
</div>
|
||||
|
||||
<div class="row column m20t" ng-if="tx.couldRemove">
|
||||
<button class="tiny expand outline dark-gray" ng-click="remove(tx)"
|
||||
<button class="tiny expand outline dark-gray" ng-click="remove(tx)"
|
||||
ng-disabled="loading" ng-show="tx.couldRemove">
|
||||
<i class="fi-x icon-sign x"></i>
|
||||
<i class="fi-trash size-14 m5r"></i>
|
||||
<span translate>Remove transaction</span>
|
||||
</button>
|
||||
<div class="text-gray size-12 text-center" show="tx.couldRemove" translate>
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<div class="content preferences p20v columns" ng-controller="preferencesBwsUrlController as prefBwsUrl">
|
||||
<form name="settingsBwsUrlForm" ng-submit="prefBwsUrl.save()" class="m20t">
|
||||
<div class="content preferences p20v" ng-controller="preferencesBwsUrlController as prefBwsUrl">
|
||||
<form name="settingsBwsUrlForm" ng-submit="prefBwsUrl.save()" class="columns">
|
||||
<label>Bitcore Wallet Service URL</label>
|
||||
<input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="prefBwsUrl.bwsurl">
|
||||
<input type="submit" class="button expand black radius" value="{{'Save'|translate}}"
|
||||
<input type="submit" class="button expand black radius" value="{{'Save'|translate}}"
|
||||
ng-style="{'background-color':index.backgroundColor}">
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
@ -407,19 +407,18 @@ history
|
|||
{{btx.message || btx.addressTo}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="m20t row">
|
||||
<div class="columns">
|
||||
|
||||
<button class="outline light-gray small expand"
|
||||
ng-disabled="index.updatingTxHistory"
|
||||
ng-click="index.updateTxHistory(index.skipHistory)"
|
||||
ng-show="index.txHistoryPaging || index.updatingTxHistory"
|
||||
>
|
||||
<span ng-show="!index.updatingTxHistory">
|
||||
<span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i>
|
||||
</span>
|
||||
<span translate ng-show="index.updatingTxHistory">Loading...</span>
|
||||
</button>
|
||||
<div class="m20t columns text-center" ng-show="index.txHistoryPaging || index.updatingTxHistory">
|
||||
<button class="outline light-gray small expand"
|
||||
ng-click="index.updateTxHistory(index.skipHistory)"
|
||||
ng-if="!index.updatingTxHistory">
|
||||
<span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i>
|
||||
</button>
|
||||
<div class="spinner" ng-if="index.updatingTxHistory">
|
||||
<div class="rect1"></div>
|
||||
<div class="rect2"></div>
|
||||
<div class="rect3"></div>
|
||||
<div class="rect4"></div>
|
||||
<div class="rect5"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -26,7 +26,6 @@ h2 {
|
|||
font-size: 20px;
|
||||
font-weight: 100;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-weight: 300;
|
||||
font-size: 16px;
|
||||
|
@ -147,7 +146,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
|
|||
|
||||
.content {
|
||||
width:100%;
|
||||
position: absolute;
|
||||
position: absolute;
|
||||
top: 46px;
|
||||
bottom: 0;
|
||||
overflow: auto;
|
||||
|
@ -1152,6 +1151,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
|
|||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#history .spinner > div {
|
||||
background-color: #7A8C9E;
|
||||
}
|
||||
|
||||
.spinner > div {
|
||||
background-color: #fff;
|
||||
height: 100%;
|
||||
|
@ -1196,4 +1199,3 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
|
|||
-webkit-transform: scaleY(1.0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -39,14 +39,14 @@ body, div, .row {
|
|||
/* END disabling text selection */
|
||||
|
||||
.inner-wrap {
|
||||
-webkit-transition-duration: 250ms;
|
||||
transition-duration: 250ms;
|
||||
-webkit-transition-duration: 250ms;
|
||||
transition-duration: 250ms;
|
||||
}
|
||||
|
||||
body {
|
||||
overflow: hidden;
|
||||
-ms-content-zooming: none;
|
||||
}
|
||||
}
|
||||
|
||||
/* Fix IE 10 */
|
||||
.extra-margin-bottom {
|
||||
|
@ -121,7 +121,7 @@ _:-ms-fullscreen, :root .main {
|
|||
left: -5px;
|
||||
height: 45px;
|
||||
top: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
.tab-bar .text-back {
|
||||
margin-left: 26px;
|
||||
|
@ -169,7 +169,7 @@ _:-ms-fullscreen, :root .main {
|
|||
}
|
||||
|
||||
.off-canvas-wrap,.inner-wrap{
|
||||
height:100%;
|
||||
height:100%;
|
||||
}
|
||||
|
||||
.walletHome {
|
||||
|
@ -212,15 +212,15 @@ ul.copayer-list img {
|
|||
}
|
||||
|
||||
.bottombar-item a {
|
||||
color: #7A8C9E;
|
||||
color: #9EA9B3;
|
||||
padding: 0.5rem 0;
|
||||
display: block;
|
||||
border-top: 3px solid #213140;
|
||||
border-top: 3px solid #122232;
|
||||
}
|
||||
|
||||
.bottombar-item a.active {
|
||||
color: #E4E8EC;
|
||||
background-color: #213140;
|
||||
background-color: #122232;
|
||||
}
|
||||
|
||||
.box-founds {
|
||||
|
@ -261,7 +261,7 @@ a.missing-copayers {
|
|||
|
||||
.footer-setup {
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
}
|
||||
|
||||
.label {
|
||||
font-size: 70%;
|
||||
|
@ -282,7 +282,7 @@ a.missing-copayers {
|
|||
.sidebar li.nav-item.selected {
|
||||
background-color: #f1f3f5;
|
||||
box-shadow: inset -1px 0px 1px 0px rgba(0,0,0,0.20);
|
||||
}
|
||||
}
|
||||
|
||||
.sidebar .avatar-wallet, .payment-uri .avatar-wallet {
|
||||
background-color: #2C3E50;
|
||||
|
@ -344,8 +344,8 @@ a.missing-copayers {
|
|||
line-height: 24px;
|
||||
}
|
||||
|
||||
/*
|
||||
* Remove all vendors hover / shadow / fade
|
||||
/*
|
||||
* Remove all vendors hover / shadow / fade
|
||||
*/
|
||||
|
||||
.tooltip {
|
||||
|
@ -432,7 +432,7 @@ a.pin-button:active {
|
|||
}
|
||||
|
||||
.tx-comment {
|
||||
border-top: 1px solid #eee;
|
||||
border-top: 1px solid #eee;
|
||||
padding-top: 10px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
@ -563,17 +563,17 @@ a.pin-button:active {
|
|||
padding-bottom: 20px;
|
||||
}
|
||||
|
||||
.modal.fade,
|
||||
.modal.fade,
|
||||
.reveal-modal.fade {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.modal.fade .modal-dialog,
|
||||
.modal.in .modal-dialog,
|
||||
.reveal-modal-bg,
|
||||
.reveal-modal-bg .fade .in,
|
||||
.reveal-modal,
|
||||
.reveal-modal .fade,
|
||||
.modal.fade .modal-dialog,
|
||||
.modal.in .modal-dialog,
|
||||
.reveal-modal-bg,
|
||||
.reveal-modal-bg .fade .in,
|
||||
.reveal-modal,
|
||||
.reveal-modal .fade,
|
||||
.reveal-modal .fade .out,
|
||||
.reveal-modal .fade .in {
|
||||
-webkit-transition: none !important;
|
||||
|
@ -641,12 +641,12 @@ a.pin-button:active {
|
|||
color: #B7C2CD;
|
||||
}
|
||||
|
||||
:-ms-input-placeholder {
|
||||
:-ms-input-placeholder {
|
||||
color: #B7C2CD;
|
||||
}
|
||||
|
||||
.animation-left.ng-enter, .animation-left.ng-leave,
|
||||
.animation-right.ng-enter, .animation-right.ng-leave {
|
||||
.animation-left.ng-enter, .animation-left.ng-leave,
|
||||
.animation-right.ng-enter, .animation-right.ng-leave {
|
||||
-webkit-transition: all ease-in-out 250ms;
|
||||
transition: all ease-in-out 250ms;
|
||||
}
|
||||
|
@ -668,7 +668,7 @@ a.pin-button:active {
|
|||
-webkit-transform: translate3d(0, 0, 0);
|
||||
transform: translate3d(0, 0, 0);
|
||||
}
|
||||
|
||||
|
||||
.animation-left.ng-leave,
|
||||
.animation-right.ng-leave {
|
||||
-webkit-transform: translate3d(0, 0, 0);
|
||||
|
@ -691,7 +691,7 @@ a.pin-button:active {
|
|||
-webkit-transform: translate3d(-100%, 0, 0);
|
||||
transform: translate3d(-100%, 0, 0);
|
||||
width:100%;
|
||||
position: absolute;
|
||||
position: absolute;
|
||||
top: 46px;
|
||||
bottom: 70px;
|
||||
overflow: auto;
|
||||
|
@ -707,6 +707,3 @@ a.pin-button:active {
|
|||
-webkit-transform: translate3d(-100%, 0, 0) !important;
|
||||
transform: translate3d(-100%, 0, 0) !important;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue