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

Merge pull request #3 from cmgustavo/bechi/ui-mobile

Browse source 
fixes mobile
This commit is contained in:
Juan Ignacio Sosa Lopez 2014-11-25 16:25:39 -03:00
commit 54d552d1b6
4 changed files with 43 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

8
css/src/main.css
View file

@ -1149,14 +1149,6 @@ button.gray:focus,
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:hover {
color: #7A8C9E;

2
index.html
View file

@ -65,7 +65,7 @@
</section>
</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>
</aside>

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

@ -1,10 +1,10 @@
<div ng-controller="SidebarController">
<div ng-controller="SidebarController" ng-init="getWallets()">
<header>
<div class="m10b" ng-click="toggleWalletSelection()">
<div ng-click="toggleWalletSelection()">
<div class="col1">
<div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
</div>
<div class="col2" ng-class="{'col2_full':!wallets.0}">
<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">
@ -23,9 +23,8 @@
</div>
</div>
</div>
<div class="col3" ng-if="wallets.0">
<a ng-class="{'selected':walletSelection}"
ng-click="toggleWalletSelection()">
<div class="col3">
<a ng-class="{'selected':walletSelection}">
<span ng-show="!walletSelection">
<i class="icon-arrow-down2"></i>
</span>
@ -35,13 +34,14 @@
</a>
</div>
</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 ng-show="walletSelection">
<div class="side-nav wallets text-center off-canvas-list" ng-show="!wallets.0">
<p class="size-12 text-gray m10t" translate>You do not have another wallets.</p>
<a href="#!/create" class="db button secondary tiny" title="Create new wallet">
<i class="m20r fi-plus"></i> {{'Create new wallet' | translate }} </a>
</div>
<ul class="side-nav wallets off-canvas-list" ng-show="wallets.0"
ng-click="toggleWalletSelection()"
ng-class="{'large':wallets.length > 4, 'medium':wallets.length > 2 && wallets.length < 5}">
ng-click="toggleWalletSelection()">
<li data-ng-repeat="item in wallets track by $index"
class="nav-item"
ng-if="item.id != $root.wallet.id">
@ -69,60 +69,44 @@
</ul>
</div>
</header>
<!-- <div ng-if="$root.wallet" class="founds box-founds p15" ng-disabled="$root.loading">
<div class="line-t" ng-show="!walletSelection" ng-click="refresh()">
<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> -->
<a href="#!/profile" class="columns text-center m30v" title="Profile">
<div class="photo-container">
<img gravatar-src="'{{username}}'" gravatar-size="35">
<div ng-show="!walletSelection" ng-init="username = $root.iden.getName()">
<div class="off-canvas-list">
<a href="#!/profile" class="columns text-center m10v" title="Profile">
<div class="photo-container">
<img gravatar-src="'{{username}}'" gravatar-size="35">
</div>
<p class="text-black m5">{{username}}</p>
<span class="db text-gray size-10" >
<i class="fi-torso"></i> {{'ViewProfile' | translate }}
</span>
</a>
</div>
<p class="text-black m5"> bechilandia@gmail.com </p>
<span class="db p20h text-gray size-10" >
<i class="fi-torso"></i> {{'ViewProfile' | translate }}
</span>
</a>
<ul class="off-canvas-list columns" ng-show="!walletSelection">
<li>
<ul class="off-canvas-list columns">
<li>
<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>
</li>
<li>
<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>
</li>
<li>
<a href="#!/import" class="db p20h nav-item" title="Import wallet">
<i class="size-24 m20r fi-download"></i> {{'Import a wallet' | translate }} </a>
</li>
<li>
</li>
<li>
<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>
</li>
<li>
<a href="#!/import" class="db p20h nav-item" title="Import wallet">
<i class="size-24 m20r fi-download"></i> {{'Import a wallet' | translate }} </a>
</li>
<li>
<a href="#!/more" class="db p20h nav-item" title="Settings">
<i class="size-24 m20r fi-widget"></i> {{'Settings' | translate }} </a>
</li>
<li>
</li>
<li>
<a href="#!/" class="db p20h nav-item" title="Close"
ng-click="signout()"><i class="size-24 m20r fi-power"></i> {{'Close'|translate}}</a>
</li>
</ul>
<div class="text-gray size-10 text-center m20t columns">
<div ng-include="'views/includes/version.html'"></div>
</li>
</ul>
<div class="text-gray size-12 text-center columns">
<div ng-include="'views/includes/version.html'"></div>
</div>
</div>
</div>

3
views/includes/sidebar.html
View file

@ -50,8 +50,7 @@
</div>
<div>
<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}">
<ul class="side-nav wallets" ng-class="{'pullDown': walletSelection}" ng-show="wallets.0">
<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="avatar-wallet">{{(item.name || item.id) | limitTo: 1}}</div>