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

Merge pull request #1872 from bechi/ui-mobile

Browse source 
Ui mobile
This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-25 16:49:46 -03:00
commit a26ce42059
6 changed files with 115 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

15
css/src/main.css
View file

@ -65,6 +65,7 @@ body, html{
header { header {
background-color: #1ABC9C; background-color: #1ABC9C;
overflow: hidden; overflow: hidden;
height: 62px;
} }
header .creation { header .creation {
@ -75,6 +76,7 @@ header .creation {
header .alt-currency { header .alt-currency {
background: #16A085; background: #16A085;
color: #fff;
} }
.panel h3, .box-setup h3 { .panel h3, .box-setup h3 {
@ -534,6 +536,7 @@ a.button-setup {
.m20r {margin-right: 20px;} .m20r {margin-right: 20px;}
.m15r {margin-right: 15px;} .m15r {margin-right: 15px;}
.m20t {margin-top: 20px;} .m20t {margin-top: 20px;}
.m5 {margin: 5px;}
.m10 {margin: 10px;} .m10 {margin: 10px;}
.m15 {margin: 15px;} .m15 {margin: 15px;}
.m15h {margin: 0 15px;} .m15h {margin: 0 15px;}
@ -557,13 +560,14 @@ a.button-setup {
.oh {overflow:hidden;} .oh {overflow:hidden;}
.vm {vertical-align: middle;} .vm {vertical-align: middle;}
.ma { margin: 0 auto;} .ma { margin: 0 auto;}
.tu {text-transform: uppercase;}
.small { .small {
font-size: 60%; font-size: 60%;
line-height: inherit; line-height: inherit;
} }
.line-dashed-setup-v { .line-dashed-setuph-v {
border-left: 1px dashed #415970; border-left: 1px dashed #415970;
} }
@ -607,6 +611,7 @@ a.button-setup {
width: 72%; width: 72%;
float: left; float: left;
color: #fff; color: #fff;
text-transform: lowercase;
} }
.name-wallet i { .name-wallet i {
@ -1144,14 +1149,6 @@ button.gray:focus,
height: 100%; height: 100%;
} }
.side-nav.wallets.medium {
height: 280px;
}
.side-nav.wallets.large {
height: 380px;
}
.side-nav.wallets a.wallet-item, .side-nav.wallets a.wallet-item,
.side-nav.wallets a.wallet-item:hover { .side-nav.wallets a.wallet-item:hover {
color: #7A8C9E; color: #7A8C9E;

41
css/src/mobile.css
View file

@ -45,11 +45,12 @@
bottom: 0; bottom: 0;
width: 100%; width: 100%;
z-index: 5; z-index: 5;
background: #3C4E60; background: #2C3E50;
} }
.left-off-canvas-menu { .left-off-canvas-menu {
background: #2C3E50; background: #E4E8EC;
line-height: 24px;
} }
.off-canvas-wrap,.inner-wrap{ .off-canvas-wrap,.inner-wrap{
@ -89,9 +90,26 @@
} }
ul.off-canvas-list li a { ul.off-canvas-list li a {
text-transform: uppercase;
font-size: 12px;
vertical-align: middle;
font-weight: 100;
border-bottom: transparent; border-bottom: transparent;
padding: 0.66667rem 1rem; padding: 0.66667rem 1rem;
color: #fff; color: #7A8C9E;
border-top: 1px solid rgba(255,255,255,0.25);
-moz-box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.15);
box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.15);
}
ul.off-canvas-list li a i {
vertical-align: middle;
}
ul.off-canvas-list li a.wallet-item {
border: none;
-moz-box-shadow: none;
box-shadow: none;
} }
ul.off-canvas-list li a i { ul.off-canvas-list li a i {
@ -99,14 +117,16 @@
} }
.bottombar-item a { .bottombar-item a {
color: #fff; color: #7A8C9E;
padding: 4px 0; padding: 0.5rem 0;
display: block; display: block;
border-bottom: 3px solid transparent;
} }
.bottombar-item a.active { .bottombar-item a.active {
color: #000; color: #E4E8EC;
background-color: #fff; background-color: #213140;
border-bottom: 3px solid #1ABC9C;
} }
.box-founds { .box-founds {
@ -165,14 +185,11 @@
margin-bottom: 50px; margin-bottom: 50px;
} }
.founds {
color: #8597A7;
}
.side-nav.wallets { .side-nav.wallets {
padding: 0; padding: 0;
height: auto; height: 100%;
left: 0; left: 0;
top: 56px;
} }
ul.off-canvas-list li a:hover { ul.off-canvas-list li a:hover {

2
index.html
View file

@ -65,7 +65,7 @@
</section> </section>
</nav> </nav>
<aside class="left-off-canvas-menu"> <aside class="left-off-canvas-menu" ng-if="$root.iden">
<div ng-include="'views/includes/sidebar-mobile.html'"></div> <div ng-include="'views/includes/sidebar-mobile.html'"></div>
</aside> </aside>

6
views/includes/bottombar-mobile.html
View file

@ -1,8 +1,8 @@
<div class="row" ng-controller="SidebarController"> <div class="row collapse" ng-controller="SidebarController">
<div class="medium-3 small-3 columns text-center bottombar-item" data-ng-repeat="item in menu" ui-route="{{item.link}}" ng-if="item.link!='more'"> <div class="medium-3 small-3 columns text-center bottombar-item" data-ng-repeat="item in menu" ui-route="{{item.link}}" ng-if="item.link!='more'">
<a href="#!/{{item.link}}" ng-class="{active: isActive(item)}"> <a href="#!/{{item.link}}" ng-class="{active: isActive(item)}">
<i class="size-24 {{item.icon}} db"></i> <i class="size-36 {{item.icon}} db"></i>
<div class="size-10"> <div class="size-10 tu">
{{item.title}} {{item.title}}
<span class="label alert round" ng-if="item.link=='send' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span> <span class="label alert round" ng-if="item.link=='send' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
</div> </div>

145
views/includes/sidebar-mobile.html
View file

@ -1,32 +1,47 @@
<div ng-controller="SidebarController"> <div ng-controller="SidebarController" ng-init="getWallets()">
<header class="text-center"> <header>
<div class="text-white m10v"> <div ng-click="toggleWalletSelection()">
<img src="img/logo-negative-beta.svg" alt="" width="80"> <div class="col1">
<div ng-include="'views/includes/version.html'"></div> <div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
</div>
<div class="col2">
<div class="oh m5t m10r">
<div class="right size-10 text-white">[ {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]</div>
<div class="name-wallet">
<div class="ellipsis">{{$root.wallet.getName()}}</div>
</div>
</div>
<div class="founds size-12">
<span ng-if="!$root.wallet.isReady()">Waiting for copayers...</span>
<div ng-if="$root.wallet.isReady()">
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
<div ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
<b class="m5r">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
<span ng-if="alternativeBalanceAvailable" class="alt-currency">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
<span ng-if="!alternativeBalanceAvailable" class="alt-currency">N/A</span>
</div>
</div>
</div>
</div>
<div class="col3">
<a ng-class="{'selected':walletSelection}">
<span ng-show="!walletSelection">
<i class="icon-arrow-down2"></i>
</span>
<span ng-show="walletSelection">
<i class="icon-arrow-up2"></i>
</span>
</a>
</div>
</div> </div>
<div ng-show="walletSelection">
</header> <div class="side-nav wallets text-center off-canvas-list" ng-show="!wallets.0">
<div ng-if="$root.wallet" class="founds box-founds p15" ng-disabled="$root.loading"> <p class="size-12 text-gray m10t" translate>You do not have another wallets.</p>
<div class="m10b" ng-click="toggleWalletSelection()"> <a href="#!/create" class="db button secondary tiny" title="Create new wallet">
<span>{{$root.wallet.getName()}} <i class="m20r fi-plus"></i> {{'Create new wallet' | translate }} </a>
{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}
</span>
<a class="right text-gray">
<span ng-show="!walletSelection">
<i class="fi-arrow-down"></i>
</span>
<span ng-show="walletSelection">
<i class="fi-arrow-up"></i>
</span>
</a>
</div>
<div ng-if="walletSelection">
<div class="side-nav wallets" ng-show="!wallets.0">
<p class="size-12" translate>You do not have another wallets.</p>
</div> </div>
<ul class="side-nav wallets off-canvas-list" ng-show="wallets.0" <ul class="side-nav wallets off-canvas-list" ng-show="wallets.0"
ng-click="toggleWalletSelection()" ng-click="toggleWalletSelection()">
ng-class="{'large':wallets.length > 4, 'medium':wallets.length > 2 && wallets.length < 5}">
<li data-ng-repeat="item in wallets track by $index" <li data-ng-repeat="item in wallets track by $index"
class="nav-item" class="nav-item"
ng-if="item.id != $root.wallet.id"> ng-if="item.id != $root.wallet.id">
@ -53,53 +68,45 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="line-t" ng-show="!walletSelection" ng-click="refresh()"> </header>
<a class="side-bar text-gray right" title="Manual Refresh"><i class="fi-refresh"></i></a>
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span ng-if="!$root.updatingBalance">{{totalBalance || 0
|noFractionNumber}} {{$root.wallet.settings.unitName}}
</span>
</div>
<div class="m10t" ng-show="lockedBalance && !walletSelection" ng-click="refresh()">
{{'Locked'|translate}}
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span ng-show="!$root.updatingBalance">
{{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}
</span>
</div>
</div>
<div class="line-t p0"></div> <div ng-show="!walletSelection" ng-init="username = $root.iden.getName()">
<ul class="off-canvas-list" ng-show="!walletSelection"> <div class="off-canvas-list">
<li> <a href="#!/profile" class="columns text-center m10v" title="Profile">
<a href="#!/more" class="db p20h nav-item" title="Settings"> <div class="photo-container">
<i class="size-24 m20r fi-widget"></i> {{'Settings' | translate }} </a> <img gravatar-src="'{{username}}'" gravatar-size="35">
</li> </div>
<li> <p class="text-black m5">{{username}}</p>
<span class="db text-gray size-10" >
<i class="fi-torso"></i> {{'ViewProfile' | translate }}
</span>
</a>
</div>
<ul class="off-canvas-list columns">
<li>
<a href="#!/create" class="db p20h nav-item" title="Create new wallet"> <a href="#!/create" class="db p20h nav-item" title="Create new wallet">
<i class="size-24 m20r fi-plus"></i> {{'Create new wallet' | translate }} </a> <i class="size-24 m20r fi-plus"></i> {{'Create new wallet' | translate }} </a>
</li> </li>
<li> <li>
<a href="#!/join" class="db p20h nav-item" title="Join shared wallet"> <a href="#!/join" class="db p20h nav-item" title="Join shared wallet">
<i class="size-24 m20r fi-torsos-all"></i> {{'Join shared wallet' | translate }} </a> <i class="size-24 m20r fi-torsos-all"></i> {{'Join shared wallet' | translate }} </a>
</li> </li>
<li> <li>
<a href="#!/import" class="db p20h nav-item" title="Import wallet"> <a href="#!/import" class="db p20h nav-item" title="Import wallet">
<i class="size-24 m20r fi-download"></i> {{'Import wallet' | translate }} </a> <i class="size-24 m20r fi-download"></i> {{'Import a wallet' | translate }} </a>
</li> </li>
<li> <li>
<a href="#!/profile" class="db p20h nav-item" title="Profile"> <a href="#!/more" class="db p20h nav-item" title="Settings">
<i class="size-24 m20r fi-torso"></i> {{'Profile' | translate }} </a> <i class="size-24 m20r fi-widget"></i> {{'Settings' | translate }} </a>
</li> </li>
<li> <li>
<a href="#!/" class="db p20h nav-item" title="Close" <a href="#!/" class="db p20h nav-item" title="Close"
ng-click="signout()"><i class="size-24 m20r fi-power"></i> {{'Close'|translate}}</a> ng-click="signout()"><i class="size-24 m20r fi-power"></i> {{'Close'|translate}}</a>
</li> </li>
</ul> </ul>
<div class="text-gray size-12 text-center columns">
<div ng-include="'views/includes/version.html'"></div>
</div>
</div>
</div> </div>

3
views/includes/sidebar.html
View file

@ -50,8 +50,7 @@
</div> </div>
<div> <div>
<ul class="side-nav wallets" ng-class="{'pullDown': walletSelection}" ng-show="wallets.0" <ul class="side-nav wallets" ng-class="{'pullDown': walletSelection}" ng-show="wallets.0">
ng-class="{'large':wallets.length > 4, 'medium':wallets.length > 2 && wallets.length < 5}">
<li data-ng-repeat="item in wallets track by $index" class="nav-item" ng-if="item.id != $root.wallet.id" ng-click="switchWallet(item.id)"> <li data-ng-repeat="item in wallets track by $index" class="nav-item" ng-if="item.id != $root.wallet.id" ng-click="switchWallet(item.id)">
<div class="col1"> <div class="col1">
<div class="avatar-wallet">{{(item.name || item.id) | limitTo: 1}}</div> <div class="avatar-wallet">{{(item.name || item.id) | limitTo: 1}}</div>