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

Merge pull request #3595 from bechi/feat/style-10

Browse source 
Feat/style 10
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-04 13:32:04 -03:00
commit 746a60db1f
15 changed files with 343 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,11 @@
<a ng-click="index.setTab(item, false, 0, true)"
ng-style="{'color': index.tab == item.link ? index.backgroundColor : '#4B6178'}" id="menu-{{item.link}}">
<i class="size-18 {{item.icon}} db"></i>
<div class="size-10 tu">
<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 alert round" ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">
<span class="label activity round" ng-style="{'background-color': index.tab == item.link" ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">
{{ index.pendingTxProposalsCountForUs }}
</span>
<span class="menu-activity hide-for-large-only" ng-if="item.link=='walletHome'">
</div>
</a>

4
public/views/modals/tx-details.html
View file

@ -18,11 +18,11 @@
<div class="header-modal size-36 text-center">
<div ng-show="btx.action != 'invalid'">
<div ng-show="btx.action == 'received'">
<img src="img/icon-receive.svg" alt="sync" width="50">
<img src="img/icon-receive-history.svg" alt="sync" width="50">
<p class="m0 text-gray size-14" translate>Received</p>
</div>
<div ng-show="btx.action == 'sent'">
<img src="img/icon-sent.svg" alt="sync" width="50">
<img src="img/icon-sent-history.svg" alt="sync" width="50">
<p class="m0 text-gray size-14" translate>Sent</p>
</div>
<div ng-show="btx.action == 'moved'">

4
public/views/walletHome.html
View file

@ -211,8 +211,8 @@
class="row collapse last-transactions-content">
<div class="large-6 medium-6 small-6 columns size-14">
<div class="m10r left">
<img src="img/icon-receive.svg" alt="sync" width="40" ng-show="btx.action == 'received'">
<img src="img/icon-sent.svg" alt="sync" width="40" ng-show="btx.action == 'sent'">
<img src="img/icon-receive-history.svg" alt="sync" width="40" ng-show="btx.action == 'received'">
<img src="img/icon-sent-history.svg" alt="sync" width="40" ng-show="btx.action == 'sent'">
<img src="img/icon-moved.svg" alt="sync" width="40" ng-show="btx.action == 'moved'">
</div>
<div class="m10t">