mirror of https://github.com/BTCPrivate/copay.git
fix conflict
This commit is contained in:
commit
64cde1378e
21
css/main.css
21
css/main.css
|
@ -14,12 +14,13 @@ html, body {height: 100%;}
|
||||||
#wrap {min-height: 100%;}
|
#wrap {min-height: 100%;}
|
||||||
|
|
||||||
#main {overflow:auto;
|
#main {overflow:auto;
|
||||||
padding-bottom: 20px;} /* must be same height as the footer */
|
padding-bottom: 30px;} /* must be same height as the footer */
|
||||||
|
|
||||||
#footer {position: relative;
|
#footer {position: relative;
|
||||||
margin-top: -20px; /* negative value of footer height */
|
margin-top: -30px; /* negative value of footer height */
|
||||||
height: 20px;
|
height: 30px;
|
||||||
clear:both;
|
clear:both;
|
||||||
|
padding: 5px 2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.logo {
|
.logo {
|
||||||
|
@ -28,6 +29,13 @@ html, body {height: 100%;}
|
||||||
height: 51px;
|
height: 51px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.logo {
|
||||||
|
margin: 0 auto;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.top-bar-section li:not(.has-form) a:not(.button) {
|
.top-bar-section li:not(.has-form) a:not(.button) {
|
||||||
line-height: 60px;
|
line-height: 60px;
|
||||||
}
|
}
|
||||||
|
@ -59,6 +67,7 @@ html, body {height: 100%;}
|
||||||
.header a.button.small-icon {
|
.header a.button.small-icon {
|
||||||
padding: 0.1rem 0.3rem;
|
padding: 0.1rem 0.3rem;
|
||||||
font-size: 0.9rem;
|
font-size: 0.9rem;
|
||||||
|
margin-left: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header h1, h5, p {
|
.header h1, h5, p {
|
||||||
|
@ -206,6 +215,10 @@ small.has-error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.new-address {
|
||||||
|
width: 220px;
|
||||||
|
}
|
||||||
|
|
||||||
hr { margin: 2.25rem 0;}
|
hr { margin: 2.25rem 0;}
|
||||||
|
|
||||||
[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
|
[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
|
||||||
|
@ -237,6 +250,8 @@ hr { margin: 2.25rem 0;}
|
||||||
.m30a {margin: 30px auto;}
|
.m30a {margin: 30px auto;}
|
||||||
.br100 {border-radius: 100%;}
|
.br100 {border-radius: 100%;}
|
||||||
.lh {line-height: 0;}
|
.lh {line-height: 0;}
|
||||||
|
.oh {overflow:hidden;}
|
||||||
|
|
||||||
.signin input.ng-dirty.ng-invalid {
|
.signin input.ng-dirty.ng-invalid {
|
||||||
border: 2px red solid;
|
border: 2px red solid;
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,6 +87,10 @@ body {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.header-content a {
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
.panel {
|
.panel {
|
||||||
color: #333;
|
color: #333;
|
||||||
background: #FFFFFF;
|
background: #FFFFFF;
|
||||||
|
@ -177,3 +181,8 @@ button.secondary:hover { background-color: #FFDF00 !important;}
|
||||||
|
|
||||||
.text-gray { color: #999;}
|
.text-gray { color: #999;}
|
||||||
|
|
||||||
|
#footer {
|
||||||
|
background: #2C3E50;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
47
index.html
47
index.html
|
@ -14,22 +14,23 @@
|
||||||
<div data-ng-init="init()" data-ng-controller="HeaderController">
|
<div data-ng-init="init()" data-ng-controller="HeaderController">
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<div class="header-content">
|
<div class="header-content">
|
||||||
<div class="large-3 columns">
|
<div class="large-3 medium-3 columns">
|
||||||
<a href="#" class="logo" title="copay"></a>
|
<span class="logo"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-center large-9 columns m10t" ng-show="$root.wallet">
|
<div class="large-9 medium-9 columns text-center p10t" ng-show="$root.wallet">
|
||||||
<h6 class="large-6 columns line-dashed-v">
|
<div class="large-4 medium-4 columns line-dashed-v">
|
||||||
|
<a href="#/peer" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
|
||||||
<span ng-if="!$root.wallet.name && $root.wallet.id">{{$root.wallet.id}}</span>
|
<span ng-if="!$root.wallet.name && $root.wallet.id">{{$root.wallet.id}}</span>
|
||||||
<span ng-if="$root.wallet.name">Wallet: {{$root.wallet.name}} <{{$root.wallet.id}}></span>
|
<span ng-if="$root.wallet.name">{{$root.wallet.name}}</span>
|
||||||
({{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}})
|
</a>
|
||||||
<a class="button radius small-icon" href="#" ng-click="signout()"><i class="fi-power"></i></a>
|
<a class="button radius small-icon" href="#" title="Signout" ng-click="signout()"><i class="fi-power"></i></a>
|
||||||
</h6>
|
</div>
|
||||||
<p class="large-3 columns line-dashed-v">
|
<div class="large-4 medium-4 columns line-dashed-v">
|
||||||
Balance: {{totalBalance || 0}} <i class="fi-bitcoin"></i><br>
|
Balance: {{totalBalance || 0}} <i class="fi-bitcoin"></i><br>
|
||||||
</p>
|
</div>
|
||||||
<p class="large-3 columns">
|
<div class="large-4 medium-4 columns">
|
||||||
Available to Spend: {{availableBalance || 0}} <i class="fi-bitcoin"></i>
|
Available to Spend: {{availableBalance || 0}} <i class="fi-bitcoin"></i>
|
||||||
</p>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -96,9 +97,13 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="footer" class="row" data-ng-controller="FooterController">
|
<div id="footer" data-ng-controller="FooterController" ng-show="$root.wallet">
|
||||||
<div class="large-12 columns text-center">
|
|
||||||
<link rel="stylesheet" ng-href="{{theme}}">
|
<link rel="stylesheet" ng-href="{{theme}}">
|
||||||
|
<div class="large-4 columns">
|
||||||
|
<span class="size-12">Copayers
|
||||||
|
{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</span>
|
||||||
|
</div>
|
||||||
|
<div class="large-8 columns text-right">
|
||||||
<a class="size-12" ng-if="themes.length > 1" ng-click="change_theme(th)" ng-repeat="th in themes">{{th}} {{$last ? '' : '· '}}</a>
|
<a class="size-12" ng-if="themes.length > 1" ng-click="change_theme(th)" ng-repeat="th in themes">{{th}} {{$last ? '' : '· '}}</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -250,22 +255,22 @@
|
||||||
<script type="text/ng-template" id="addresses.html">
|
<script type="text/ng-template" id="addresses.html">
|
||||||
<div class="addresses" data-ng-controller="AddressesController">
|
<div class="addresses" data-ng-controller="AddressesController">
|
||||||
<div ng-show='$root.wallet.publicKeyRing.isComplete()'>
|
<div ng-show='$root.wallet.publicKeyRing.isComplete()'>
|
||||||
<h3>Addresses (available to spend)</h3>
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-6 columns">
|
<div class="large-9 columns" ng-if="addrs[0]">
|
||||||
|
<h3>Addresses (available to spend)</h3>
|
||||||
|
<div class="large-8 columns">
|
||||||
<a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}}
|
<a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}}
|
||||||
|
|
||||||
<span ng-if="!isMain[addr]">(change)</span>
|
<span ng-if="!isMain[addr]">(change)</span>
|
||||||
<span class="right">({{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i>)</span></a>
|
<span class="right">({{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i>)</span></a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="large-3 columns line-dashed-v text-center">
|
<div class="large-4 columns line-dashed-v text-center">
|
||||||
<qrcode size="160" data="{{selectedAddr}}"></qrcode>
|
<qrcode size="160" data="{{selectedAddr}}"></qrcode>
|
||||||
<p class="m10t" ng-repeat="addr in addrs" ng-if="selectedAddr==addr"> <strong> {{balanceByAddr[addr]}} <i class="fi-bitcoin"></i> </strong> </p>
|
<p class="m10t" ng-repeat="addr in addrs" ng-if="selectedAddr==addr"> <strong> {{balanceByAddr[addr]}} <i class="fi-bitcoin"></i> </strong> </p>
|
||||||
</div>
|
</div>
|
||||||
<div class="large-3 columns text-center">
|
</div>
|
||||||
|
<div class="columns text-center" ng-class="{'large-3' : addrs[0]}">
|
||||||
<p> Create a New <strong> Address </strong> </p>
|
<p> Create a New <strong> Address </strong> </p>
|
||||||
<button class="secondary round expand" ng-click="newAddr()" ng-disabled="loading" loading="Creating"> Create </button>
|
<button class="secondary round expandi new-address" ng-click="newAddr()" ng-disabled="loading" loading="Creating"> Create </button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue