fix(all): the buttons

This commit is contained in:
Jason Dreyzehner 2016-10-11 23:23:54 -04:00
commit 2e6d394673
25 changed files with 38 additions and 43 deletions

View file

@ -29,7 +29,7 @@
<span class="input-label" translate>Email</span> <span class="input-label" translate>Email</span>
<input type="text" <input type="text"
id="email" id="email"
placeholder="name@example.com" placeholder="name@example.com"
name="email" name="email"
ng-model="addressbookEntry.email"> ng-model="addressbookEntry.email">
</label> </label>
@ -54,7 +54,7 @@
<div class="padding"> <div class="padding">
<button type="submit" <button type="submit"
class="button button-block button-positive" class="button button-standard button-primary"
ng-click="add(addressbookEntry)" ng-click="add(addressbookEntry)"
ng-disabled="!addressbookForm.$valid" translate> ng-disabled="!addressbookForm.$valid" translate>
Save Save

View file

@ -52,9 +52,7 @@
You havent added any contacts to your address book yet. Get started by adding your first one. You havent added any contacts to your address book yet. Get started by adding your first one.
</p> </p>
</div> </div>
<div class="row"> <button class="button button-standard button-primary" ui-sref="tabs.addressbook.add" translate>Add Contact</button>
<button class="button button-block button-positive col" ui-sref="tabs.addressbook.add" translate>Add Contact</button>
</div>
</div> </div>
</div> </div>
</ion-content> </ion-content>

View file

@ -28,7 +28,7 @@
</div> </div>
</div> </div>
<button class="button button-block button-positive" <button class="button button-standard button-primary"
ng-click="sendTo()" translate> ng-click="sendTo()" translate>
Send Money Send Money
</button> </button>

View file

@ -18,7 +18,7 @@
<div ng-if="!giftCards" class="m20t padding text-center"> <div ng-if="!giftCards" class="m20t padding text-center">
<button class="button button-block button-positive" ui-sref="tabs.giftcards.amazon.buy"> <button class="button button-standard button-primary" ui-sref="tabs.giftcards.amazon.buy">
Buy now Buy now
</button> </button>

View file

@ -64,7 +64,7 @@
<div class="input-label" translate>In order to verify your wallet backup, please type your password.</div> <div class="input-label" translate>In order to verify your wallet backup, please type your password.</div>
<input type="text" id="passphrase" ng-model="data.passphrase" autocapitalize="off" spellcheck="false" autofocus/> <input type="text" id="passphrase" ng-model="data.passphrase" autocapitalize="off" spellcheck="false" autofocus/>
</label> </label>
<button ng-disabled="!data.passphrase" class="button button-block button-positive" ng-click="goToStep(4);" translate>Confirm <button ng-disabled="!data.passphrase" class="button button-standard button-primary" ng-click="goToStep(4);" translate>Confirm
</button> </button>
</div> </div>
</div> </div>

View file

@ -53,7 +53,7 @@
<wallets ng-if="wallets[0]" wallets="wallets"></wallets> <wallets ng-if="wallets[0]" wallets="wallets"></wallets>
<div class="padding"> <div class="padding">
<button class="button button-block button-positive" <button class="button button-standard button-primary"
ng-disabled="!formData.fiat" ng-disabled="!formData.fiat"
type="submit"> type="submit">
Buy now Buy now
@ -79,7 +79,7 @@
<span ng-show="buy.giftCard.status == 'FAILURE'"> <span ng-show="buy.giftCard.status == 'FAILURE'">
This failure could not be recoverable. Request your refund from your list of cards This failure could not be recoverable. Request your refund from your list of cards
</span> </span>
<button class="button button-block button-positive" ng-click="$root.go('amazon')"> <button class="button button-standard button-primary" ng-click="$root.go('amazon')">
Back Back
</button> </button>
</div> </div>

View file

@ -80,7 +80,7 @@
... ...
</div> </div>
<button class="button button-block button-positive" <button class="button button-standard button-primary"
type="submit" type="submit"
ng-disabled="limits.transactDisabledPendingFirstTransaction || !buy.buyPrice.qty || buy.loading"> ng-disabled="limits.transactDisabledPendingFirstTransaction || !buy.buyPrice.qty || buy.loading">
Continue Continue
@ -101,7 +101,7 @@
<input type="number" ng-model="twoFaCode" placeholder="2FA Code" required ignore-mouse-wheel> <input type="number" ng-model="twoFaCode" placeholder="2FA Code" required ignore-mouse-wheel>
</label> </label>
</div> </div>
<button class="button button-block button-positive" <button class="button button-standard button-primary"
type="submit" ng-disabled="buyForm.$invalid || buy.loading"> type="submit" ng-disabled="buyForm.$invalid || buy.loading">
Buy Buy
</button> </button>
@ -117,7 +117,7 @@
A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days. A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days.
</p> </p>
<button class="button button-block button-positive" ui-sref="tabs.buyandsell.glidera">OK</button> <button class="button button-standard button-primary" ui-sref="tabs.buyandsell.glidera">OK</button>
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

View file

@ -29,7 +29,7 @@
<div ng-show="secret"> <div ng-show="secret">
<div class="text-center m10t" ng-if="isCordova"> <div class="text-center m10t" ng-if="isCordova">
<button class="button button-outline button-positive" <button class="button button-outline button-primary"
ng-click="shareSecret()"> ng-click="shareSecret()">
<i class="icon ion-ios-upload-outline"></i> <i class="icon ion-ios-upload-outline"></i>
<span translate>Share invitation</span> <span translate>Share invitation</span>

View file

@ -36,7 +36,7 @@
<p class="m20t text-gray size-12">Connect your Glidera account to get started</p> <p class="m20t text-gray size-12">Connect your Glidera account to get started</p>
<button class="button button-block button-positive" <button class="button button-standard button-primary"
ng-click="openExternalLink(glidera.getAuthenticateUrl(), '_system'); showOauthForm = true"> ng-click="openExternalLink(glidera.getAuthenticateUrl(), '_system'); showOauthForm = true">
Connect to Glidera Connect to Glidera
</button> </button>
@ -65,7 +65,7 @@
</div> </div>
<div class="col"> <div class="col">
<input <input
class="button button-block button-positive" class="button button-standard button-primary"
type="submit" type="submit"
value="Get started" value="Get started"
ng-disabled="oauthCodeForm.$invalid"> ng-disabled="oauthCodeForm.$invalid">

View file

@ -1,4 +1,4 @@
<button class="button button-block button-positive" ng-disabled="sendStatus"> <button class="button button-standard button-primary" ng-disabled="sendStatus">
<span ng-if="!sendStatus"> <span ng-if="!sendStatus">
<ng-transclude></ng-transclude> <ng-transclude></ng-transclude>
</span> </span>

View file

@ -122,7 +122,7 @@
</div> <!-- advanced --> </div> <!-- advanced -->
</div> <!-- list --> </div> <!-- list -->
<button type="submit" class="button button-block button-positive" <button type="submit" class="button button-standard button-primary"
ng-disabled="joinForm.$invalid || ((encrypt && !passwordSaved) || encrypt && ((join.seedSourceId == 'new' && !createPassphrase) || (join.seedSourceId == 'set' && !passphrase)))" ng-disabled="joinForm.$invalid || ((encrypt && !passwordSaved) || encrypt && ((join.seedSourceId == 'new' && !createPassphrase) || (join.seedSourceId == 'set' && !passphrase)))"
translate>Join translate>Join
</button> </button>

View file

@ -58,7 +58,7 @@
<button type="submit" <button type="submit"
ng-disabled="scanning || !scannedKey" ng-disabled="scanning || !scannedKey"
class="button button-block button-positive" class="button button-standard button-primary"
ng-style="{'background-color': wallet.color}" ng-style="{'background-color': wallet.color}"
translate>Scan Wallet Funds translate>Scan Wallet Funds
</button> </button>
@ -74,7 +74,7 @@
<button <button
ng-show="balanceSat > 0" ng-show="balanceSat > 0"
ng-disabled="sending" ng-disabled="sending"
class="button button-block button-positive" class="button button-standard button-primary"
ng-style="{'background-color': wallet.color}" ng-style="{'background-color': wallet.color}"
ng-click="sweepWallet()" ng-click="sweepWallet()"
translate>Sweep Wallet translate>Sweep Wallet
@ -82,7 +82,7 @@
<button <button
ng-show="balanceSat <= 0 && scanned" ng-show="balanceSat <= 0 && scanned"
class="button button-block button-positive" class="button button-standard button-primary"
ng-style="{'background-color': wallet.color}" ng-style="{'background-color': wallet.color}"
ng-click="init()" ng-click="init()"
translate>Scan Again translate>Scan Again

View file

@ -15,7 +15,7 @@
</label> </label>
</div> </div>
<button type="submit" <button type="submit"
class="button button-block button-positive" class="button button-standard button-primary"
ng-disabled="aliasForm.$invalid" translate> ng-disabled="aliasForm.$invalid" translate>
Save Save
</button> </button>

View file

@ -15,6 +15,6 @@
</a> </a>
</label> </label>
</div> </div>
<button class="button button-block button-positive" ng-click="save()" translate>Save</button> <button class="button button-standard button-primary" ng-click="save()" translate>Save</button>
</ion-content> </ion-content>
</ion-view> </ion-view>

View file

@ -15,7 +15,7 @@
</label> </label>
</div> </div>
<button type="submit" <button type="submit"
class="button button-block button-positive" class="button button-standard button-primary"
ng-disabled="emailForm.$invalid" translate> ng-disabled="emailForm.$invalid" translate>
Save Save
</button> </button>

View file

@ -98,10 +98,10 @@
<div class="padding text-center" translate> <div class="padding text-center" translate>
Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time. Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.
</div> </div>
<button class="button button-block button-positive" ng-click="scan()" translate> <button class="button button-standard button-primary" ng-click="scan()" translate>
Scan addresses for funds Scan addresses for funds
</button> </button>
<button class="button button-block button-positive" ng-show="isCordova" ng-click="sendAddrs()" translate> <button class="button button-standard button-primary" ng-show="isCordova" ng-click="sendAddrs()" translate>
Send addresses by email Send addresses by email
</button> </button>
</div> </div>

View file

@ -80,7 +80,7 @@
... ...
</div> </div>
<button class="button button-block button-positive" <button class="button button-standard button-primary"
type="submit" type="submit"
ng-disabled="limits.transactDisabledPendingFirstTransaction || !sell.sellPrice.qty"> ng-disabled="limits.transactDisabledPendingFirstTransaction || !sell.sellPrice.qty">
Continue Continue
@ -101,7 +101,7 @@
<input type="number" ng-model="twoFaCode" placeholder="2FA Code" required ignore-mouse-wheel> <input type="number" ng-model="twoFaCode" placeholder="2FA Code" required ignore-mouse-wheel>
</label> </label>
</div> </div>
<button class="button button-block button-positive" <button class="button button-standard button-primary"
type="submit" type="submit"
ng-disabled="sellForm.$invalid "> ng-disabled="sellForm.$invalid ">
Sell Sell
@ -118,7 +118,7 @@
A transfer has been initiated to your bank account and should arrive in 4-6 business days. A transfer has been initiated to your bank account and should arrive in 4-6 business days.
</p> </p>
<button class="button button-block button-positive" ui-sref="tabs.buyandsell.glidera">OK</button> <button class="button button-standard button-primary" ui-sref="tabs.buyandsell.glidera">OK</button>
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

View file

@ -98,11 +98,10 @@
</div> <!-- advanced --> </div> <!-- advanced -->
</div> <!-- list --> </div> <!-- list -->
<button type="submit" class="button button-block button-positive" <button type="submit" class="button button-standard button-primary"
ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((seedSource.id == 'new' && !formData.createPassphrase) || (seedSource.id == 'set' && !formData.passphrase)))"> ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((seedSource.id == 'new' && !formData.createPassphrase) || (seedSource.id == 'set' && !formData.passphrase)))">
<span translate>Create new wallet</span> <span translate>Create new wallet</span>
</button> </button>
</form> </form>
</ion-content> </ion-content>
</ion-view> </ion-view>

View file

@ -128,12 +128,10 @@
</div> <!-- advanced --> </div> <!-- advanced -->
</div> <!-- list --> </div> <!-- list -->
<button type="submit" class="button button-block button-positive" <button type="submit" class="button button-standard button-primary"
ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((seedSource.id == 'new' && !formData.createPassphrase) || (seedSource.id == 'set' && !formData.passphrase)))"> ng-disabled="setupForm.$invalid || ((encrypt && !formData.passwordSaved) || encrypt && ((seedSource.id == 'new' && !formData.createPassphrase) || (seedSource.id == 'set' && !formData.passphrase)))">
<span translate>Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet</span> <span translate>Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet</span>
</button> </button>
</form> </form>
</ion-content> </ion-content>
</ion-view> </ion-view>

View file

@ -49,7 +49,7 @@
<button <button
ng-click="downloadWalletBackup()" ng-click="downloadWalletBackup()"
class="button button-block button-positive" class="button button-standard button-primary"
ng-disabled="(!formData.password || formData.password != formData.repeatpassword)" ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
ng-style="{'background-color':wallet.color}" ng-style="{'background-color':wallet.color}"
ng-show="!isSafari && !isCordova"> ng-show="!isSafari && !isCordova">
@ -59,7 +59,7 @@
<button <button
ng-click="viewWalletBackup()" ng-click="viewWalletBackup()"
class="button button-block button-positive" class="button button-standard button-primary"
ng-disabled="(!formData.password || formData.password != formData.repeatpassword)" ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
ng-style="{'background-color':wallet.color}" ng-style="{'background-color':wallet.color}"
ng-show="isSafari && !isCordova"> ng-show="isSafari && !isCordova">
@ -69,13 +69,13 @@
<div ng-show="isCordova"> <div ng-show="isCordova">
<h4 translate>Export options</h4> <h4 translate>Export options</h4>
<button class="button button-block button-positive" <button class="button button-standard button-primary"
ng-disabled="(!formData.password || formData.password != formData.repeatpassword)" ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
ng-style="{'background-color':wallet.color}" ng-style="{'background-color':wallet.color}"
ng-click="copyWalletBackup()"> ng-click="copyWalletBackup()">
<i class="fi-clipboard-pencil"></i> <i class="fi-clipboard-pencil"></i>
<span translate>Copy to clipboard</span></button> <span translate>Copy to clipboard</span></button>
<button class="button button-block button-positive" ng-disabled="(!formData.password || formData.password != formData.repeatpassword)" <button class="button button-standard button-primary" ng-disabled="(!formData.password || formData.password != formData.repeatpassword)"
ng-style="{'background-color':wallet.color}" ng-style="{'background-color':wallet.color}"
ng-click="sendWalletBackup()"><i class="fi-mail"></i> ng-click="sendWalletBackup()"><i class="fi-mail"></i>
<span translate>Send by email</span></button> <span translate>Send by email</span></button>

View file

@ -34,7 +34,7 @@
</div> </div>
</div> </div>
<button type="submit" class="button button-block button-positive" ng-disabled="importForm.$invalid || !formData.password" translate> <button type="submit" class="button button-standard button-primary" ng-disabled="importForm.$invalid || !formData.password" translate>
Import backup Import backup
</button> </button>
</form> </form>

View file

@ -37,7 +37,7 @@
</div> </div>
</div> </div>
<button translate type="submit" class="button button-block button-positive"> <button translate type="submit" class="button button-standard button-primary">
Import Import
</button> </button>
</div> <!-- seedoptions show --> </div> <!-- seedoptions show -->

View file

@ -60,7 +60,7 @@
</div> </div>
<button type="submit" <button type="submit"
class="button button-block button-positive" class="button button-standard button-primary"
ng-disabled="importForm12.$invalid" translate>Import ng-disabled="importForm12.$invalid" translate>Import
</button> </button>
</form> </form>

View file

@ -33,7 +33,7 @@
<span translate>All signing devices must be added to this multisig wallet before bitcoin addresses can be created.</span> <span translate>All signing devices must be added to this multisig wallet before bitcoin addresses can be created.</span>
</div> </div>
<div> <div>
<button class="button button-block button-positive" ng-click="goCopayers()" translate>Open wallet</button> <button class="button button-standard button-primary" ng-click="goCopayers()" translate>Open wallet</button>
</div> </div>
</div> </div>
<div class="row border-top"> <div class="row border-top">

View file

@ -9,7 +9,7 @@
<div class="card"> <div class="card">
<div class="item item-text-wrap" ng-include="'views/includes/terms.html'"></div> <div class="item item-text-wrap" ng-include="'views/includes/terms.html'"></div>
</div> </div>
<button class="button button-block button-positive" <button class="button button-standard button-primary"
ng-show="lang != 'en'" ng-show="lang != 'en'"
ng-click="openExternalLink(disclaimerUrl)" translate> ng-click="openExternalLink(disclaimerUrl)" translate>
Official English Disclaimer Official English Disclaimer