clean up merge

This commit is contained in:
Nick Cardin 2016-09-01 12:46:25 -04:00
commit a2052b3f3a
5 changed files with 29 additions and 23 deletions

View file

@ -35,12 +35,15 @@
</select>
</label>
<label class="item item-input item-stacked-label" ng-show="seedSourceId == 'trezor' || seedSourceId == 'ledger'">
<label class="item item-input item-stacked-label"
ng-show="seedSourceId == 'trezor' || seedSourceId == 'ledger'">
<span class="input-label" translate>Account Number</span>
<input type="number" id="account" ng-model="account" ignore-mouse-wheel>
</label>
<ion-toggle ng-show="seedSourceId == 'trezor'" ng-model="isMultisig" toggle-class="toggle-positive">
<ion-toggle ng-show="seedSourceId == 'trezor'"
ng-model="isMultisig"
toggle-class="toggle-positive">
<span translate>Shared Wallet</span>
</ion-toggle>
@ -62,8 +65,7 @@
<button translate type="submit" class="button button-block button-positive">
Import
</button>
</div>
<!-- seedoptions show -->
</div> <!-- seedoptions show -->
</form>