anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #54 from bechi/feature/01-tx-page

Browse source 
Feature/01 tx page
This commit is contained in:
Gustavo Maximiliano Cortez 2014-04-15 17:52:23 -03:00
commit c19e99a99d
2 changed files with 69 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

52
css/main.css
View file

@ -77,7 +77,16 @@ body {
border:0; border:0;
} }
.panel:hover { .transactions .panel {
background: #ECECEC;
}
.transactions .panel.pending {
background-color: #fff;
padding: 1rem;
}
.home .panel:hover {
background: #efefef; background: #efefef;
} }
@ -96,8 +105,40 @@ a.box-backup {
display: block; display: block;
} }
p { h3 {
margin-bottom: 0.5rem; font-weight: 100;
font-size: 25px;
}
.line-dashed-v {
border-right: 2px dashed #E3E3E3;
}
.line-dashed-h {
margin: 1rem 0;
border-bottom: 2px dashed #E3E3E3;
}
.panel p {
margin-bottom: 0;
}
span.panel-res {
float: right;
width: 3%;
padding: 0.4rem 0.55rem;
margin: 0 1rem;
border-radius: 1rem;
}
.panel-sign {
color: #111;
background: #FAE448;
}
.panel-ignore {
color: #fff;
background: #111;
} }
.pending button { .pending button {
@ -105,8 +146,8 @@ p {
} }
.line { .line {
border-top: 1px solid #ccc; border-top: 1px solid #f2f2f2;
padding-bottom: 1rem; margin: 0.5rem 0 1rem;
} }
button.primary { background-color: #111; } button.primary { background-color: #111; }
@ -115,6 +156,7 @@ button.secondary { background-color: #FAE448 !important; }
button.primary:hover { background-color: #333;} button.primary:hover { background-color: #333;}
button.secondary:hover { background-color: #FFDF00 !important;} button.secondary:hover { background-color: #FFDF00 !important;}
.pr {position: relative;}
.m0 {margin: 0;} .m0 {margin: 0;}
.db {display: block;} .db {display: block;}
.size-12 { font-size: 12px; } .size-12 { font-size: 12px; }

34
index.html
View file

@ -152,14 +152,13 @@
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<h2>Pending Transactions <small>({{txsoutput.length}})</small></h2> <h3>Pending Transactions <small>({{txsoutput.length}})</small></h3>
<div class="panel pending" ng-repeat="txp in txsoutput "> <div class="panel pending" ng-repeat="txp in txsoutput ">
{{txp}} {{txp}}
<div class="row"> <div class="row">
<p class="large-5 columns"> Address 1</p> <p class="large-5 columns"> Address 1</p>
<i class="large-2 columns fi-arrow-right size-16 text-center"></i> <i class="large-2 columns fi-arrow-right size-16 text-center"></i>
<p class="large-5 columns"> Address 2</p> <p class="large-5 columns"> Address 2</p>
<p>Transaction description</p>
<div class="large-12 columns m0"> <div class="large-12 columns m0">
<div class="line"></div> <div class="line"></div>
<button class="primary round large-4 columns"><i class="large-2 columns fi-x size-16 text-center"></i> Ignore</button> <button class="primary round large-4 columns"><i class="large-2 columns fi-x size-16 text-center"></i> Ignore</button>
@ -168,28 +167,39 @@
</div> </div>
</div> <!-- end of row --> </div> <!-- end of row -->
</div> <!-- end of pending --> </div> <!-- end of pending -->
<div class="line-dashed-h"></div>
</div> </div>
<div class="large-12 columns"> <div class="large-12 columns">
<h2>Last Transactions</h2> <h3>Last Transactions</h3>
<div class="panel"> <div class="panel">
<div class="row"> <div class="row">
<p class="large-5 columns"> Address 1</p> <p class="large-5 columns"> Address 1 <small class="right"> 1231 BTC </small></p>
<i class="large-2 columns fi-arrow-left size-16 text-center"></i> <i class="large-1 columns fi-arrow-left size-16 text-center"></i>
<p class="large-5 columns"> Adress 2</p> <p class="large-5 columns"> Adress 2 <small class="right"> 1231 BTC </small></p>
<span class="panel-res panel-sign">
<i class="fi-check size-16"></i>
</span>
</div> </div>
</div> </div>
<div class="panel"> <div class="panel">
<div class="row"> <div class="row">
<p class="large-5 columns"> Address 1</p> <p class="large-5 columns"> Address 1 <small class="right"> 1231 BTC </small></p>
<i class="large-2 columns fi-arrow-left size-16 text-center"></i> <i class="large-1 columns fi-arrow-left size-16 text-center"></i>
<p class="large-5 columns"> Adress 2</p> <p class="large-5 columns"> Adress 2 <small class="right"> 1231 BTC </small></p>
<span class="panel-res panel-sign">
<i class="fi-check size-16"></i>
</span>
</div> </div>
</div> </div>
<div class="panel"> <div class="panel">
<div class="row"> <div class="row">
<p class="large-5 columns"> Address 1</p> <p class="large-5 columns"> Address 1 <small class="right"> 1231 BTC </small></p>
<i class="large-2 columns fi-arrow-left size-16 text-center"></i> <i class="large-1 columns fi-arrow-left size-16 text-center"></i>
<p class="large-5 columns"> Adress 2</p> <p class="large-5 columns"> Adress 2 <small class="right"> 1231 BTC </small></p>
<span class="panel-res panel-ignore">
<i class="fi-x size-16"></i>
</span>
</div> </div>
</div> </div>
</div> </div>