Merge pull request #2654 from matiu/feat/touchdown

Feat/touchdown
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-29 09:57:29 -03:00
commit e44780379a
10 changed files with 119 additions and 57 deletions

View file

@ -1,7 +1,6 @@
<div
class="bottom-bar row collapse">
<div class="bottom-bar row collapse">
<div class="medium-3 small-3 columns text-center bottombar-item" ng-repeat="item in index.menu">
<a ng-click="index.setTab(item.link)" ng-class="{'active': index.tab == item.link}">
<a ng-click="index.setTab(item.link)" ng-class="{'active': index.tab == item.link}" id="menu-{{item.link}}">
<i class="size-36 {{item.icon}} db"></i>
<div class="size-10 tu">
{{item.title|translate}}
@ -11,5 +10,5 @@
</div>
</a>
</div>
</div>

View file

@ -10,7 +10,7 @@
</section>
<section class="right-small" ng-show="!goBackToState">
<a ng-show="!closeToHome && index.isComplete" class="p10"
<a id="camera-icon" ng-show="!closeToHome && index.isComplete" class="p10"
ng-click="topbar.openScanner()"><i class="fi-camera size-24"></i></a>
<a ng-show="closeToHome" class="p10 ng-animate-disabled"
ng-click="topbar.goHome(); closeToHome = null">

View file

@ -224,7 +224,7 @@
</div>
<div class="row m20t">
<div class="large-12 columns">
<button class="button black expand radius" ng-click="home.newAddress()"
<button class="button black expand radius" ng-click="home.setNewAddress()"
ng-style="{'background-color':index.backgroundColor}" ng-disabled="home.blockUx || index.isOffline ||home.generatingAddress" translate>
Generate new address
</button>