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,8 +1,7 @@
|
||||||
<div
|
<div
|
||||||
class="bottom-bar row collapse">
|
class="bottom-bar row collapse">
|
||||||
<div class="medium-3 small-3 columns text-center bottombar-item" ng-repeat="item in index.menu">
|
<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}"
|
<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>
|
<i class="size-36 {{item.icon}} db"></i>
|
||||||
<div class="size-10 tu">
|
<div class="size-10 tu">
|
||||||
{{item.title|translate}}
|
{{item.title|translate}}
|
||||||
|
@ -14,4 +13,3 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<div class="p45t" ng-init="updateCopayerList()">
|
<div class="p45t" ng-init="updateCopayerList()">
|
||||||
<h4 class="title m0" translate>Information</h4>
|
<h4 class="title m0" translate>Information</h4>
|
||||||
<ul class="no-bullet size-14 m0">
|
<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="text-gray" translate>To</span>:
|
||||||
<span class="right">{{tx.toAddress}}</span>
|
<span class="right">{{tx.toAddress}}</span>
|
||||||
</li>
|
</li>
|
||||||
|
@ -134,7 +134,7 @@
|
||||||
<div class="row column m20t" ng-if="tx.couldRemove">
|
<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">
|
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>
|
<span translate>Remove transaction</span>
|
||||||
</button>
|
</button>
|
||||||
<div class="text-gray size-12 text-center" show="tx.couldRemove" translate>
|
<div class="text-gray size-12 text-center" show="tx.couldRemove" translate>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<div class="content preferences p20v columns" ng-controller="preferencesBwsUrlController as prefBwsUrl">
|
<div class="content preferences p20v" ng-controller="preferencesBwsUrlController as prefBwsUrl">
|
||||||
<form name="settingsBwsUrlForm" ng-submit="prefBwsUrl.save()" class="m20t">
|
<form name="settingsBwsUrlForm" ng-submit="prefBwsUrl.save()" class="columns">
|
||||||
<label>Bitcore Wallet Service URL</label>
|
<label>Bitcore Wallet Service URL</label>
|
||||||
<input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="prefBwsUrl.bwsurl">
|
<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}}"
|
||||||
|
|
|
@ -407,19 +407,18 @@ history
|
||||||
{{btx.message || btx.addressTo}}
|
{{btx.message || btx.addressTo}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="m20t row">
|
<div class="m20t columns text-center" ng-show="index.txHistoryPaging || index.updatingTxHistory">
|
||||||
<div class="columns">
|
|
||||||
|
|
||||||
<button class="outline light-gray small expand"
|
<button class="outline light-gray small expand"
|
||||||
ng-disabled="index.updatingTxHistory"
|
|
||||||
ng-click="index.updateTxHistory(index.skipHistory)"
|
ng-click="index.updateTxHistory(index.skipHistory)"
|
||||||
ng-show="index.txHistoryPaging || index.updatingTxHistory"
|
ng-if="!index.updatingTxHistory">
|
||||||
>
|
|
||||||
<span ng-show="!index.updatingTxHistory">
|
|
||||||
<span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i>
|
<span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i>
|
||||||
</span>
|
|
||||||
<span translate ng-show="index.updatingTxHistory">Loading...</span>
|
|
||||||
</button>
|
</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>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -26,7 +26,6 @@ h2 {
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
font-weight: 100;
|
font-weight: 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
h3 {
|
h3 {
|
||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
|
@ -1152,6 +1151,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#history .spinner > div {
|
||||||
|
background-color: #7A8C9E;
|
||||||
|
}
|
||||||
|
|
||||||
.spinner > div {
|
.spinner > div {
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
@ -1196,4 +1199,3 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
|
||||||
-webkit-transform: scaleY(1.0);
|
-webkit-transform: scaleY(1.0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -212,15 +212,15 @@ ul.copayer-list img {
|
||||||
}
|
}
|
||||||
|
|
||||||
.bottombar-item a {
|
.bottombar-item a {
|
||||||
color: #7A8C9E;
|
color: #9EA9B3;
|
||||||
padding: 0.5rem 0;
|
padding: 0.5rem 0;
|
||||||
display: block;
|
display: block;
|
||||||
border-top: 3px solid #213140;
|
border-top: 3px solid #122232;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bottombar-item a.active {
|
.bottombar-item a.active {
|
||||||
color: #E4E8EC;
|
color: #E4E8EC;
|
||||||
background-color: #213140;
|
background-color: #122232;
|
||||||
}
|
}
|
||||||
|
|
||||||
.box-founds {
|
.box-founds {
|
||||||
|
@ -707,6 +707,3 @@ a.pin-button:active {
|
||||||
-webkit-transform: translate3d(-100%, 0, 0) !important;
|
-webkit-transform: translate3d(-100%, 0, 0) !important;
|
||||||
transform: translate3d(-100%, 0, 0) !important;
|
transform: translate3d(-100%, 0, 0) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue