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

Merge pull request #537 from bechi/feature/layout-details

Browse source 
Feature/layout details
This commit is contained in:
Matias Alejo Garcia 2014-06-03 15:04:06 -03:00
commit d9a6874357
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
css/main.css
View file

@ -30,6 +30,11 @@ html, body {height: 100%;}
box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.10); box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.10);
} }
.text-gray.active {
color: #111 !important;
font-weight: 700;
}
#footer { #footer {
position: fixed; position: fixed;
margin-top: -96px; /* negative value of footer height */ margin-top: -96px; /* negative value of footer height */
@ -59,7 +64,6 @@ html, body {height: 100%;}
.logo { .logo {
display: block; display: block;
width: 130px;
height: 51px; height: 51px;
margin: 0 auto; margin: 0 auto;
} }
@ -623,6 +627,7 @@ ul.pagination li.current a:hover, ul.pagination li.current a:focus {
background-size: 90px 44px !important; background-size: 90px 44px !important;
float: left; float: left;
margin-top: 0.7rem; margin-top: 0.7rem;
width: 130px;
} }
.header-content .small-9 { .header-content .small-9 {

16
index.html
View file

@ -139,13 +139,13 @@
<div id="footer" data-ng-controller="FooterController" ng-class="{'footer-home': !$root.wallet}"> <div id="footer" data-ng-controller="FooterController" ng-class="{'footer-home': !$root.wallet}">
<link rel="stylesheet" ng-href="{{theme}}"> <link rel="stylesheet" ng-href="{{theme}}">
<div class="row" ng-show="!$root.wallet"> <div ng-show="!$root.wallet">
<div class="large-12 columns text-right"> <div class="large-12 columns text-right">
Copay Copay
<small>v{{version}}</small> <small>v{{version}}</small>
</div> </div>
</div> </div>
<div class="row p10t" ng-show="$root.wallet"> <div class="p10t" ng-show="$root.wallet">
<div class="large-3 medium-3 hide-for-small columns"> <div class="large-3 medium-3 hide-for-small columns">
<div> <div>
<strong>{{$root.wallet.getName()}}</strong> <strong>{{$root.wallet.getName()}}</strong>
@ -419,11 +419,11 @@
<div class="transactions" data-ng-controller="TransactionsController"> <div class="transactions" data-ng-controller="TransactionsController">
<div class="row" ng-show='$root.wallet.publicKeyRing.isComplete()'> <div class="row" ng-show='$root.wallet.publicKeyRing.isComplete()'>
<div class="large-12 columns"> <div class="large-12 columns">
<h4> Transaction proposals <span ng-if="onlyPending">[Pending]</span> <small>({{txs.length}})</small></h4> <h4> Transaction proposals <small>({{txs.length}})</small></h4>
<ul class="button-group radius"> <ul class="inline-list">
<li> <button class="secondary" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating"> Pending </button> <li> <a class="text-gray size-12" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating" ng-class="{'active' : onlyPending}"> [ Pending ] </a> </li>
<li> <button class="secondary" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating"> All </button> <li> <a class="text-gray size-12" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating" ng-class="{'active' : !onlyPending}"> [ All ] </a> </li>
</ul> </ul>
<div class="panel radius pending" ng-repeat="tx in txs | paged"> <div class="panel radius pending" ng-repeat="tx in txs | paged">
<div class="txheader row m10"> <div class="txheader row m10">
@ -518,8 +518,8 @@
</div> </div>
<div class="large-12 columns"> <div class="large-12 columns">
<h4>Last transactions</h4> <h4>Last transactions</h4>
<a ng-click="toogleLast()" ng-disabled="loading" loading="Updating" ng-hide="lastShowed && !loading">Show</a> <a class="size-12" ng-click="toogleLast()" ng-disabled="loading" loading="Updating" ng-hide="lastShowed && !loading">Show</a>
<a ng-click="toogleLast()" ng-disabled="loading" loading="Updating" ng-show="lastShowed && !loading">Hide</a> <a class="size-12" ng-click="toogleLast()" ng-disabled="loading" loading="Updating" ng-show="lastShowed && !loading">Hide</a>
<div class="btransactions" ng-if="lastShowed"> <div class="btransactions" ng-if="lastShowed">
<div ng-if="!blockchain_txs[0].txid && !loading"> <div ng-if="!blockchain_txs[0].txid && !loading">
No transactions yet. No transactions yet.