BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix conflicts

This commit is contained in:
Mario Colque 2014-03-31 18:28:59 -03:00
parent 92f4422841 9ec6e65e18
commit 0172223bd8
4 changed files with 60 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
css/main.css
View File

@ -38,7 +38,7 @@ body {
}
.header-content {
padding: 1.5rem;
padding: 1.5rem 3rem 1.5rem 0;
overflow: hidden;
}
@ -46,6 +46,18 @@ body {
color: #fff;
}
.panel {
background: #FFFFFF;
padding: 0.25rem 1rem;
}
button.primary { background-color: #111; }
button.secondary { background-color: #FAE448 !important; }
button.primary:hover { background-color: #333;}
button.secondary:hover { background-color: #D7C020 !important;}
.size-12 { font-size: 12px; }
.size-14 { font-size: 14px; }
.size-16 { font-size: 16px; }

13
img/logo-negative.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

13
img/logo.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

42
index.html
View File

@ -13,7 +13,9 @@
<body>
<div class="header" data-ng-init="init()" data-ng-controller="HeaderController">
<div class="header-content">
<h1 class="left">Copay</h1>
<figure class="left">
<img src="./img/logo-negative.svg" alt="" width="130">
</figure>
<div class="text-right" ng-show="$root.peerId">
<h5>Company Funds</h5>
<p>4.324 BTC</p>
@ -63,8 +65,8 @@
<h3>Join wallet</h3>
<input type="text" class="form-control" placeholder="Peer ID" ng-model="connectionId" autofocus>
</div>
<div class="large-6 columns">
<button class="btn btn-default" type="button" ng-click="join(connectionId)">Join</button>
<div class="large-3 columns">
<button class="button primary expand round" type="button" ng-click="join(connectionId)">Join</button>
</div>
</div>
<hr>
@ -72,8 +74,8 @@
<div class="large-6 columns">
<h3>Create a new wallet</h3>
</div>
<div class="large-6 columns">
<button class="btn btn-primary btn-block" ng-click="create()">Create</button>
<div class="large-3 columns">
<button class="button secondary expand round" ng-click="create()">Create</button>
</div>
</div>
</div>
@ -81,23 +83,21 @@
</script>
<script type="text/ng-template" id="peer.html">
<div ng-controller="PeerController" ng-init="init()">
<h1>I am <span class="text-muted">{{$root.peerId}}</span></h1>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Copayers ({{$root.connectedPeers.length}}/5)</h3>
</div>
<div class="panel-body">
<ul>
<li ng-repeat="copayer in $root.connectedPeers">
<span ng-if="copayer == $root.peerId">You ({{$root.peerId}})</span>
<span ng-if="copayer != $root.peerId">{{copayer}}</span>
</li>
</ul>
</div>
<div class="row" ng-controller="PeerController" ng-init="init()">
<div class="large-6 columns">
<h1>I am <p class="text-muted">{{$root.peerId}}</p></h1>
</div>
<div class="text-center">
<a href="#/home">Go home</a>
<div class="large-6 columns">
<h3 class="panel-title">Copayers ({{$root.connectedPeers.length}}/5)</h3>
<ul class="no-bullet">
<li class="panel" ng-repeat="copayer in $root.connectedPeers">
<span ng-if="copayer == $root.peerId"> You ({{$root.peerId}})<i class="fi-check size-24"></i></span>
<span ng-if="copayer != $root.peerId">{{copayer}}</span>
</li>
</ul>
<div class="text-center">
<button href="#/home" class="button secondary round large expand">Go to home</button>
</div>
</div>
</div>
</script>