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

fixes importants ux issues

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-26 18:50:58 -03:00
commit e0ccb14ab5
13 changed files with 125 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
css/src/main.css
View file

@ -330,7 +330,7 @@ a:hover {
.main { .main {
margin-left: 250px; margin-left: 250px;
padding: 100px 1.5rem; padding: 85px 1.5rem;
background-color: #F8F8FB; background-color: #F8F8FB;
} }

31
css/src/mobile.css
View file

@ -7,7 +7,7 @@
@media (max-width: 1024px) { @media (max-width: 1024px) {
.logo-setup { .logo-setup {
margin: 20px 0; margin: 0;
padding: 2rem 0; padding: 2rem 0;
} }
@ -24,11 +24,11 @@
} }
.main { .main {
height: 100%; height: 92%;
margin-top: 40px; margin-top: 40px;
margin-left: 0; margin-left: 0;
margin-bottom: -40px; margin-bottom: -40px;
padding: 20px 0 90px 0; padding: 20px 0 80px 0;
} }
.tab-bar { .tab-bar {
@ -48,6 +48,16 @@
background: #2C3E50; background: #2C3E50;
} }
header {
height: 45px;
line-height: 110%;
}
.col3 a {
height: 45px;
padding: 12px 5px;
}
.left-off-canvas-menu { .left-off-canvas-menu {
background: #E4E8EC; background: #E4E8EC;
line-height: 24px; line-height: 24px;
@ -61,6 +71,14 @@
height:100%; height:100%;
} }
.avatar-wallet {
margin-top: 5px;
margin-left: 5px;
margin-right: 5px;
padding: 0.35rem 0.65rem;
}
.copayers { .copayers {
position: relative; position: relative;
padding: 0; padding: 0;
@ -87,6 +105,7 @@
.tab-bar h1 { .tab-bar h1 {
font-weight: 100; font-weight: 100;
text-align: center;
} }
ul.off-canvas-list li a { ul.off-canvas-list li a {
@ -134,11 +153,11 @@
} }
.left-small { .left-small {
border-right: 1px solid #425568; border-right: none;
} }
.right-small { .right-small {
border-left: 1px solid #425568; border-left: none;
} }
.right-small a { .right-small a {
@ -189,7 +208,7 @@
padding: 0; padding: 0;
height: 100%; height: 100%;
left: 0; left: 0;
top: 56px; top: 45px;
} }
ul.off-canvas-list li a:hover { ul.off-canvas-list li a:hover {

12
views/copayers.html
View file

@ -1,10 +1,14 @@
<div ng-controller="CopayersController"> <div ng-controller="CopayersController">
<div ng-if='$root.wallet && $root.wallet.isReady()' ng-init="goToWallet()"></div> <div ng-if='$root.wallet && $root.wallet.isReady()' ng-init="goToWallet()"></div>
<h1 translate class="hide-for-large-up"> <div class="row hide-for-large-up">
Waiting copayers for {{$root.wallet.getName()}} <div class="medium-12 small-12 columns">
<small>{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</small> <h1 translate>
</h1> Waiting copayers for {{$root.wallet.getName()}}
<small>{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</small>
</h1>
</div>
</div>
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<div ng-if="!$root.wallet.isReady()"> <div ng-if="!$root.wallet.isReady()">

6
views/create.html
View file

@ -11,7 +11,11 @@
</div> </div>
</div> </div>
<div class="setup" ng-show="!loading && !$root.starting"> <div class="setup" ng-show="!loading && !$root.starting">
<h1 class="hide-for-large-up">{{$root.title}}</h1> <div class="row hide-for-large-up">
<div class="medium-12 small-12 columns">
<h1>{{$root.title}}</h1>
</div>
</div>
<form name="setupForm" ng-submit="create(setupForm)" novalidate> <form name="setupForm" ng-submit="create(setupForm)" novalidate>
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">

46
views/history.html
View file

@ -1,20 +1,32 @@
<div class="transactions" data-ng-controller="HistoryController" data-ng-init="update()"> <div class="transactions" data-ng-controller="HistoryController" data-ng-init="update()">
<div ng-show='$root.wallet.isReady()'> <div ng-show='$root.wallet.isReady()'>
<h1 class="hide-for-large-up">{{$root.title}}</h1> <div class="row">
<div ng-if="loading" class="m20b"> <div class="large-12 medium-12 small-12 columns">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> <h1 class="hide-for-large-up">{{$root.title}}</h1>
<span translate>Loading...</span> <div ng-if="loading" class="m20b">
</div> <i class="fi-bitcoin-circle icon-rotate spinner"></i>
<div ng-if="!blockchain_txs[0].txid && !loading"> <span translate>Loading...</span>
<em><strong translate>No transactions yet.</strong></em> </div>
<div ng-if="!blockchain_txs[0].txid && !loading">
<em><strong translate>No transactions yet.</strong></em>
</div>
</div>
</div> </div>
<div class="row" ng-if="blockchain_txs[0].txid"> <div class="row" ng-if="blockchain_txs[0].txid">
<div class="large-12 columns"> <div class="large-12 columns">
<div class="panel" <div class="panel"
ng-repeat="btx in blockchain_txs | orderBy:'-ts'" ng-click="btx.showDetails = !btx.showDetails"> ng-repeat="btx in blockchain_txs | orderBy:'-ts'">
<div class="row size-14"> <div class="row size-14">
<div class="large-2 medium-2 small-12 columns"> <div class="large-2 medium-2 small-12 columns" ng-click="btx.showDetails = !btx.showDetails">
<div class="tx-date"> <div class="tx-date oh">
<div class="right hide-for-large-only">
<span ng-show="!btx.showDetails">
<i class="icon-arrow-down2"></i>
</span>
<span ng-show="btx.showDetails">
<i class="icon-arrow-up2"></i>
</span>
</div>
<time <time
class="hastip" class="hastip"
ng-if="btx.ts" ng-if="btx.ts"
@ -61,7 +73,7 @@
</div> </div>
<div class="large-1 columns show-for-large-up text-gray text-right" ng-init="btx.showDetails = false"> <div class="large-1 columns show-for-large-up text-gray text-right" ng-init="btx.showDetails = false">
<a> <a ng-click="btx.showDetails = !btx.showDetails">
<i ng-if="!btx.showDetails" class="icon-arrow-down4"></i> <i ng-if="!btx.showDetails" class="icon-arrow-down4"></i>
<i ng-if="btx.showDetails" class="icon-arrow-up4"></i> <i ng-if="btx.showDetails" class="icon-arrow-up4"></i>
</a> </a>
@ -105,8 +117,15 @@
</div> </div>
</div> </div>
</div> </div>
<div class="line-white"></div> </div>
<div class="right size-12"> </div>
<div ng-show="blockchain_txs[0].txid">
<div class="line-white"></div>
<div class="row">
<div class="large-9 columns">
<pagination page="currentPage" total-items="totalItems" items-per-page="itemsPerPage" on-select-page="selectPage(page)" max-size="10" />
</div>
<div class="large-3 columns m5t text-right size-12 show-for-large-only">
<div ng-if="generating"> <div ng-if="generating">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> <i class="fi-bitcoin-circle icon-rotate spinner"></i>
<span translate>Generating file...</span> <span translate>Generating file...</span>
@ -118,7 +137,6 @@
</a> </a>
</div> </div>
</div> </div>
<pagination page="currentPage" total-items="totalItems" items-per-page="itemsPerPage" on-select-page="selectPage(page)" max-size="10" />
</div> </div>
</div> </div>
</div> </div>

6
views/homeWallet.html
View file

@ -1,6 +1,10 @@
<div class="home-wallet" ng-controller="HomeWalletController"> <div class="home-wallet" ng-controller="HomeWalletController">
<div ng-show='$root.wallet.isReady()'> <div ng-show='$root.wallet.isReady()'>
<h1 translate class="hide-for-large-up">Home</h1> <div class="row hide-for-large-up">
<div class="medium-12 small-12 columns">
<h1 translate>Home</h1>
</div>
</div>
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">

6
views/import.html
View file

@ -12,7 +12,11 @@
</div> </div>
<div ng-show="!loading"> <div ng-show="!loading">
<h1 class="hide-for-large-up">{{$root.title}}</h1> <div class="row hide-for-large-up">
<div class="large-12 medium-12 small-12 columns">
<h1>{{$root.title}}</h1>
</div>
</div>
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<div class="panel"> <div class="panel">

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

@ -38,7 +38,7 @@
<div class="side-nav wallets text-center off-canvas-list" ng-show="!wallets[0]"> <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> <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"> <a href="#!/create" class="db button secondary tiny" title="Create new wallet">
<i class="m20r fi-plus"></i> {{'Create new wallet' | translate }} </a> <i class="m10r fi-plus"></i> {{'Create new wallet' | translate }} </a>
</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()">

6
views/join.html
View file

@ -12,7 +12,11 @@
</div> </div>
<div ng-show="!loading"> <div ng-show="!loading">
<h1 class="hide-for-large-up">{{$root.title}}</h1> <div class="row hide-for-large-up">
<div class="large-12 medium-12 small-12 columns">
<h1>{{$root.title}}</h1>
</div>
</div>
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<form name="joinForm" ng-submit="join(joinForm)" novalidate> <form name="joinForm" ng-submit="join(joinForm)" novalidate>

34
views/more.html
View file

@ -1,7 +1,11 @@
<div class="backup" ng-controller="MoreController"> <div class="backup" ng-controller="MoreController">
<h1 class="hide-for-large-up">{{$root.title}}</h1> <div class="row hide-for-large-up">
<div class="row"> <div class="large-12 medium-12 small-12 columns">
<form name="settingsForm"> <h1>{{$root.title}}</h1>
</div>
</div>
<form name="settingsForm">
<div class="row">
<div class="large-6 medium-6 columns"> <div class="large-6 medium-6 columns">
<fieldset> <fieldset>
<legend translate>Wallet Unit</legend> <legend translate>Wallet Unit</legend>
@ -16,20 +20,22 @@
</select> </select>
</fieldset> </fieldset>
</div> </div>
</form> </div>
</div> </form>
<div class="line-dashed-h m20b"></div> <div class="line-dashed-h m20b"></div>
<div class="m20b"> <div class="m20b row">
<a class="size-12" ng-click="hideAdv=!hideAdv"> <div class="large-12 columns">
<i class="fi-widget m3r"></i> <a class="size-12" ng-click="hideAdv=!hideAdv">
<span translate ng-hide="!hideAdv">Show</span> <i class="fi-widget m3r"></i>
<span translate ng-hide="hideAdv">Hide</span> <span translate ng-hide="!hideAdv">Show</span>
<span translate>advanced options</span> <span translate ng-hide="hideAdv">Hide</span>
<i ng-if="hideAdv" class="icon-arrow-down4"></i> <span translate>advanced options</span>
<i ng-if="!hideAdv" class="icon-arrow-up4"></i> <i ng-if="hideAdv" class="icon-arrow-down4"></i>
</a> <i ng-if="!hideAdv" class="icon-arrow-up4"></i>
</a>
</div>
</div> </div>
<div ng-hide="hideAdv" class="row"> <div ng-hide="hideAdv" class="row">

7
views/profile.html
View file

@ -1,6 +1,9 @@
<div class="backup" ng-controller="ProfileController"> <div class="backup" ng-controller="ProfileController">
<h1 class="hide-for-large-up">{{$root.title}}</h1> <div class="row hide-for-large-up">
<div class="large-12 medium-12 small-12 columns">
<h1>{{$root.title}}</h1>
</div>
</div>
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<div class="panel"> <div class="panel">

10
views/receive.html
View file

@ -1,8 +1,12 @@
<div class="addresses" ng-controller="ReceiveController"> <div class="addresses" ng-controller="ReceiveController">
<div ng-show='$root.wallet.isReady()'> <div ng-show='$root.wallet.isReady()'>
<h1 class="hide-for-large-up">{{$root.title}}</h1> <div class="row">
<div ng-show="!addresses[0]"> <div class="large-12 medium-12 small-12 columns">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> <h1 class="hide-for-large-up">{{$root.title}}</h1>
<div ng-show="!addresses[0]">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</div>
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="large-12 columns" ng-if="!!(addresses|removeEmpty).length"> <div class="large-12 columns" ng-if="!!(addresses|removeEmpty).length">

8
views/send.html
View file

@ -9,9 +9,13 @@
ng-include="'views/includes/transaction.html'"></div> ng-include="'views/includes/transaction.html'"></div>
</div> </div>
</div> </div>
<div ng-show="$root.txps.length != 0" class="line-dashed-h m20b"></div>
<h1 class="hide-for-large-up">{{$root.title}}</h1> <div class="row">
<div class="large-12 medium-12 small-12 columns">
<div ng-show="$root.txps.length != 0" class="line-dashed-h m20b"></div>
<h1 class="hide-for-large-up">{{$root.title}}</h1>
</div>
</div>
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<div class="panel"> <div class="panel">