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

Merge pull request #4307 from JDonadio/fix/ionic-ui

Browse source 
Fix ionic UI bugs
This commit is contained in:
Matias Alejo Garcia 2016-06-08 11:32:38 -03:00
commit bb0c739d7f
4 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/create.html
View file

@ -161,7 +161,7 @@
</div> </div>
<div class="oh" ng-show="create.seedSourceId == 'new'"> <div class="oh" ng-show="create.seedSourceId == 'new'">
<label for="single-address" class="dbi"> <label for="single-address" class="dbi">
<span translate>Single Address Wallet</span> <small translate>For audit purposes</small> <span translate>Single Address</span> <small translate>For audit purposes</small>
<ion-toggle ng-model="singleAddressEnabled" toggle-class="toggle-balanced" class="bct"> <ion-toggle ng-model="singleAddressEnabled" toggle-class="toggle-balanced" class="bct">
</ion-toggle> </ion-toggle>
</label> </label>

22
public/views/includes/note.html
View file

@ -1,13 +1,15 @@
<div class="columns m20t"> <div class="columns m20t">
<label class="size-14 text-center"> <label class="size-14 text-center">
<span ng-show="!comment" translate>Add comment</span> <span ng-show="!comment" translate>Add comment</span>
<span ng-show="comment" translate>Edit comment</span> <span ng-show="comment" translate>Edit comment</span>
</label> </label>
<input type="text" ng-model="data.comment" autofocus> <input type="text" ng-model="data.comment" autofocus>
</div> </div>
<div class="small-6 columns"> <div class="row m20t dib">
<button class="round outline dark-gray expand" ng-click="commentPopupClose()" translate>Cancel</button> <div class="half-row left">
</div> <button class="round outline dark-gray expand" ng-click="commentPopupClose()" translate>Cancel</button>
<div class="small-6 columns"> </div>
<button ng-style="{'background-color': index.backgroundColor}" class="round outline expand" ng-click="commentPopupSave()" translate>Save</button> <div class="half-row left">
<button ng-style="{'background-color': index.backgroundColor}" class="round outline expand" ng-click="commentPopupSave()" translate>Save</button>
</div>
</div> </div>

2
src/css/ionic-migration.css
View file

@ -40,7 +40,7 @@
background-color: transparent !important; background-color: transparent !important;
margin-top: -25px; margin-top: -25px;
padding-bottom: 30px; padding-bottom: 30px;
right: -25px !important; right: -24px !important;
border-width: 0px; border-width: 0px;
} }

4
src/js/controllers/create.js
View file

@ -58,13 +58,13 @@ angular.module('copayApp.controllers').controller('createController',
if (n > 1 && isChromeApp) if (n > 1 && isChromeApp)
self.seedOptions.push({ self.seedOptions.push({
id: 'ledger', id: 'ledger',
label: 'Ledger Hardware Wallet', label: gettext('Ledger Hardware Wallet'),
}); });
if (isChromeApp || isDevel) { if (isChromeApp || isDevel) {
self.seedOptions.push({ self.seedOptions.push({
id: 'trezor', id: 'trezor',
label: 'Trezor Hardware Wallet', label: gettext('Trezor Hardware Wallet'),
}); });
} }
}; };