Merge pull request #2040 from cmgustavo/bug/mobile-13

Bug/mobile 13
This commit is contained in:
Matias Alejo Garcia 2014-12-07 21:01:16 -03:00
commit 1500c61d0f
8 changed files with 50 additions and 18 deletions

View file

@ -132,9 +132,15 @@
</div>
</div>
<form name="loginForm" ng-submit="openWithCredentials(loginForm)" novalidate>
<p class="text-warning size-12" ng-show="error">
<i class="fi-x"></i> {{error|translate}}
</p>
<div class="box-notification" ng-show="error">
<div class="box-icon error">
<i class="fi-x size-24"></i>
</div>
<span class="text-warning size-14">
{{error|translate}}
</span>
</div>
<div class="input" ng-if="!usingLocalStorage">
<input type="email" ng-model="email" class="form-control" name="email" placeholder="Email" required show-focus="!isMobile">
<i class="icon-email"></i>

View file

@ -1,5 +1,5 @@
<div class="home" ng-controller="ImportProfileController">
<div class="import-profile" ng-controller="ImportProfileController">
<div class="loading-screen" ng-show="loading">
<div class="spinner">
<div class="contener_general">
@ -31,9 +31,6 @@
</div>
<div ng-show="!is_iOS">
<legend for="backupFile" class="m10b">
<span class="text-gray size-12" translate>Choose backup file</span>
</legend>
<div class="input">
<input type="file" class="db form-control"
placeholder="{{'Select a backup file'|translate}}" name="backupFile" ng-model="backupFile" ng-file-select>
@ -41,13 +38,15 @@
</div>
<div ng-show="is_iOS">
<label for="backupText" class="m10b">
<span translate>Paste backup plain text code</span> <i class="fi-clipboard"></i>
</label>
<textarea class="form-control"
<div class="input">
<textarea
placeholder="Paste backup plain text code"
class="form-control"
name="backupText"
ng-model="backupText"
rows="5"></textarea>
<i class="icon-compose"></i>
</div>
</div>
<div class="input">
<input type="password" class="form-control" placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>

View file

@ -4,8 +4,7 @@
<img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div class="box-setup">
<h1>{{title|translate}}</h1>
<h2>{{title|translate}}</h2>
<form name="settingsForm">
<div class="box-notification" ng-show="message">
<div class="box-icon">
@ -84,6 +83,5 @@
</div>
</div>
</div>
</div>
</div>