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

Merge pull request #3599 from bechi/feat/style-11

Browse source 
Feat/style 11
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-04 16:40:00 -03:00
commit af2801df19
16 changed files with 66 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/includes/menu-item.html
View file

@ -3,7 +3,7 @@
<i class="size-18 {{item.icon}} db" ng-class="{ 'icon-activity': item.link=='walletHome' }"></i>
<div class="size-10 tu" ng-class="{ 'name-activity': item.link=='walletHome' }">
{{ item.title|translate }}
<span class="label activity round" ng-style="{'background-color': index.tab == item.link" ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">
<span class="label activity round" ng-style="{'background-color':index.backgroundColor}" ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">
{{ index.pendingTxProposalsCountForUs }}
</span>
<span class="menu-activity hide-for-large-only" ng-if="item.link=='walletHome'">

16
public/views/includes/sidebar.html
View file

@ -11,15 +11,17 @@
class="nav-item">
<a ng-click="sidebar.switchWallet(item.id, index.walletId)" class="oh">
<div class="avatar-wallet"
ng-style="{'background-color':item.color}">{{(item.name || item.id) | limitTo: 1}}</div>
ng-style="{'background-color':item.color}">
<i class="icon-wallet size-21"></i>
</div>
<div class="name-wallet" ng-class="{'m8t':item.n == 1}">{{item.name || item.id}}</div>
<div class="size-12" ng-show="item.n > 1" translate>{{item.m}}-of-{{item.n}}</div>
</a>
</li>
<li>
<a ng-click="$root.go('add')" class="oh">
<i class="icon-arrow-right3 size-18 right m10t"></i>
<i class="fi-plus size-24 icon"></i>
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="fi-plus size-24 icon vm"></i>
<div class="tu text-bold">
<span class="size-12" translate>Add wallet</span>
</div>
@ -28,8 +30,8 @@
</li>
<li ng-show="index.glideraEnabled">
<a ng-click="$root.go('glidera')" class="oh">
<i class="icon-arrow-right3 size-18 right m10t"></i>
<i class="icon-bank size-24 icon"></i>
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="icon-bank size-24 icon vm"></i>
<div class="tu text-bold">
<span class="size-12" translate>Buy &amp; Sell Bitcoin</span>
</div>
@ -38,8 +40,8 @@
</li>
<li>
<a ng-click="$root.go('preferencesGlobal')" class="oh">
<i class="icon-arrow-right3 size-18 right m10t"></i>
<i class="fi-widget size-24 icon"></i>
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="fi-widget size-24 icon vm"></i>
<div class="tu text-bold">
<span class="size-12" translate>Settings</span>
</div>

4
public/views/modals/destination-address.html
View file

@ -62,7 +62,9 @@
<li class="line-b" ng-repeat="w in wallets">
<a ng-click="selectWallet(w.id, w.name)" class="db oh">
<div class="avatar-wallet"
ng-style="{'background-color':w.color}">{{(w.name || w.id) | limitTo: 1}}</div>
ng-style="{'background-color':w.color}">
<i class="icon-wallet size-21 vt"></i>
</div>
<div class="ellipsis name-wallet text-bold">{{w.name || w.id}}</div>
<div class="size-12">{{w.m}} of {{w.n}}
<span ng-show="w.network=='testnet'">[Testnet]</span>

4
public/views/modals/glidera-wallets.html
View file

@ -28,7 +28,9 @@
<li class="line-b" ng-repeat="w in wallets">
<a ng-click="selectWallet(w.id, w.name)" class="db oh">
<div class="avatar-wallet"
ng-style="{'background-color':w.color}">{{(w.name || w.id) | limitTo: 1}}</div>
ng-style="{'background-color':w.color}">
<i class="icon-wallet size-21"></i>
</div>
<div class="ellipsis name-wallet text-bold">{{w.name || w.id}}</div>
<div class="size-12">{{w.m}} of {{w.n}}
<span ng-show="w.network=='testnet'">[Testnet]</span>

4
public/views/paymentUri.html
View file

@ -32,7 +32,9 @@
<li class="panel" ng-repeat="w in wallets">
<a ng-click="payment.selectWallet(w.id)">
<div class="avatar-wallet"
ng-style="{'background-color':w.color}">{{(w.name || w.id) | limitTo: 1}}</div>
ng-style="{'background-color':w.color}">
<i class="icon-wallet size-21"></i>
</div>
<div class="ellipsis">{{w.name || w.id}}</div>
<div class="size-12">{{w.m}} of {{w.n}}
<span ng-show="w.network=='testnet'">[Testnet]</span>

3
public/views/walletHome.html
View file

@ -109,7 +109,8 @@
<div class="avatar-name columns line-b">
<div class="avatar-wallet left"
ng-style="{'background-color':index.backgroundColor}">{{ (index.alias || index.walletName) | limitTo: 1}}
ng-style="{'background-color':index.backgroundColor}">
<i class="icon-wallet size-24"></i>
</div>
<div class="wallet-info">
<div ng-show="index.isShared">