Merge pull request #211 from cmgustavo/feature/01-new-design

New design: footer and header schemas
This commit is contained in:
Manuel Aráoz 2014-04-29 11:59:05 -03:00
commit b13287870f
3 changed files with 24 additions and 15 deletions

View File

@ -14,12 +14,13 @@ html, body {height: 100%;}
#wrap {min-height: 100%;}
#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;
margin-top: -20px; /* negative value of footer height */
height: 20px;
margin-top: -30px; /* negative value of footer height */
height: 30px;
clear:both;
padding: 5px 2rem;
}
.logo {

View File

@ -157,3 +157,8 @@ button.secondary:hover { background-color: #FFDF00 !important;}
.text-gray { color: #999;}
#footer {
background: #2C3E50;
color: #fff;
}

View File

@ -14,22 +14,21 @@
<div data-ng-init="init()" data-ng-controller="HeaderController">
<div class="header">
<div class="header-content">
<div class="large-3 columns">
<a href="#" class="logo" title="copay"></a>
<div class="large-2 columns">
<span class="logo"></span>
</div>
<div class="text-center large-9 columns m10t" ng-show="$root.wallet">
<h6 class="large-6 columns line-dashed-v">
<div class="text-center large-10 columns p10t" ng-show="$root.wallet">
<h6 class="large-5 columns line-dashed-v">
<span ng-if="!$root.wallet.name && $root.wallet.id">{{$root.wallet.id}}</span>
<span ng-if="$root.wallet.name">Wallet: {{$root.wallet.name}} &lt;{{$root.wallet.id}}&gt;</span>
({{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}})
<a class="button radius small-icon" href="#" ng-click="signout()"><i class="fi-power"></i></a>
</h6>
<p class="large-3 columns line-dashed-v">
<div class="large-3 columns line-dashed-v">
Balance: {{totalBalance || 0}} <i class="fi-bitcoin"></i><br>
</p>
<p class="large-3 columns">
</div>
<div class="large-4 columns">
Available to Spend: {{availableBalance || 0}} <i class="fi-bitcoin"></i>
</p>
</div>
</div>
</div>
@ -96,9 +95,13 @@
</div>
</div>
<div id="footer" class="row" data-ng-controller="FooterController">
<div class="large-12 columns text-center">
<link rel="stylesheet" ng-href="{{theme}}">
<div id="footer" data-ng-controller="FooterController" ng-show="$root.wallet">
<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 ? '' : '&middot; '}}</a>
</div>
</div>