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

change buttons style

Browse source
This commit is contained in:
bechi 2015-05-17 00:34:26 -03:00
commit 0835c236f5
9 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/create.html
View file

@ -89,7 +89,7 @@
</div> </div>
<button type="submit" class="button black expand radius m0" ng-disabled="setupForm.$invalid"> <button type="submit" class="button round black expand m0" ng-disabled="setupForm.$invalid">
<span translate>Create</span> <span translate>Create</span>
{{requiredCopayers}}-<span translate>of</span>-{{totalCopayers}} <span translate>wallet</span> {{requiredCopayers}}-<span translate>of</span>-{{totalCopayers}} <span translate>wallet</span>
</button> </button>

4
public/views/import.html
View file

@ -49,7 +49,7 @@
<input type="password" class="form-control" placeholder="{{'Your backup password'|translate}}" <input type="password" class="form-control" placeholder="{{'Your backup password'|translate}}"
name="password" ng-model="import.password"> name="password" ng-model="import.password">
</div> </div>
<button translate type="submit" class="button radius expand black" <button translate type="submit" class="button round expand black"
ng-disabled="importForm.$invalid || !import.password"> ng-disabled="importForm.$invalid || !import.password">
Import backup Import backup
</button> </button>
@ -57,7 +57,7 @@
<div class="text-center text-gray p20v" ng-click="$root.go('importLegacy')"> <div class="text-center text-gray p20v" ng-click="$root.go('importLegacy')">
<p class="text-gray m5b size-14" translate> Have a Backup from Copay v0.9?</p> <p class="text-gray m5b size-14" translate> Have a Backup from Copay v0.9?</p>
<button class=" outline dark-gray tiny" translate> Import here <button class=" outline dark-gray tiny round" translate> Import here
<i class="icon-arrow-right3 size-14"></i> <i class="icon-arrow-right3 size-14"></i>
</button> </button>

5
public/views/importLegacy.html
View file

@ -50,7 +50,7 @@
</label> </label>
<button translate type="submit" <button translate type="submit"
class="button black radius expand m0" class="button black round expand m0"
ng-disabled="deviceForm.$invalid"> ng-disabled="deviceForm.$invalid">
Import Import
</button> </button>
@ -65,7 +65,7 @@
</form> </form>
<div class="text-center p20v"> <div class="text-center p20v">
<a class="m20t tiny button outline light-gray " ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate> <a class="m20t tiny button outline round light-gray " ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate>
Learn more about Wallet Migration Learn more about Wallet Migration
</a> </a>
</div> </div>
@ -76,4 +76,3 @@
</div> </div>
</div> </div>

2
public/views/join.html
View file

@ -83,7 +83,7 @@
</label> </label>
</div> </div>
</div> </div>
<button translate type="submit" class="button expand black m0 radius" ng-disabled="joinForm.$invalid">Join</button> <button translate type="submit" class="button expand black m0 round" ng-disabled="joinForm.$invalid">Join</button>
</form> </form>
</div> </div>
</div> </div>

2
public/views/modals/tx-details.html
View file

@ -82,7 +82,7 @@
<div ng-show="btx.txid" class="tx-details-blockchain"> <div ng-show="btx.txid" class="tx-details-blockchain">
<div class="text-center m20t"> <div class="text-center m20t">
<button class="button outline dark-gray tiny" ng-click="$root.openExternalLink('https://' + <button class="button outline round dark-gray tiny" ng-click="$root.openExternalLink('https://' +
(getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid)"> (getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid)">
<span class="text-gray" translate>See it on the blockchain</span> <span class="text-gray" translate>See it on the blockchain</span>
</button> </button>

8
public/views/modals/txp-details.html
View file

@ -92,14 +92,14 @@
<div class="row m20t" ng-if="tx.pendingForUs"> <div class="row m20t" ng-if="tx.pendingForUs">
<div class="large-5 medium-5 small-6 columns"> <div class="large-5 medium-5 small-6 columns">
<button class="button outline dark-gray m0 expand" ng-click="reject(tx);" <button class="button outline round dark-gray m0 expand" ng-click="reject(tx);"
ng-disabled="loading"> ng-disabled="loading">
<i class="fi-x"></i> <i class="fi-x"></i>
<span translate>Reject</span> <span translate>Reject</span>
</button> </button>
</div> </div>
<div class="large-5 medium-5 small-6 columns text-right"> <div class="large-5 medium-5 small-6 columns text-right">
<button class="button primary m0 expand" ng-click="sign(tx)" <button class="button primary round m0 expand" ng-click="sign(tx)"
ng-style="{'background-color':color}" ng-style="{'background-color':color}"
ng-disabled="loading"> ng-disabled="loading">
<i class="fi-check"></i> <i class="fi-check"></i>
@ -116,7 +116,7 @@
<div class="m10t" <div class="m10t"
ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'"> ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
<div translate>But not broadcasted. Try to send manually</div> <div translate>But not broadcasted. Try to send manually</div>
<button class="primary" <button class="primary round"
ng-click="broadcast(tx)" ng-click="broadcast(tx)"
ng-disabled="loading"> <i class="fi-upload-cloud"></i> ng-disabled="loading"> <i class="fi-upload-cloud"></i>
<span translate>Broadcast Transaction</span> <span translate>Broadcast Transaction</span>
@ -136,7 +136,7 @@
<div class="text-gray size-12 text-center m20b" show="tx.couldRemove" translate> <div class="text-gray size-12 text-center m20b" show="tx.couldRemove" translate>
* Only transactions created by yourself with no peer signatures can be removed * Only transactions created by yourself with no peer signatures can be removed
</div> </div>
<button class="tiny expand outline dark-gray" ng-click="remove(tx)" <button class="tiny expand round outline dark-gray" ng-click="remove(tx)"
ng-disabled="loading" ng-show="tx.couldRemove"> ng-disabled="loading" ng-show="tx.couldRemove">
<i class="fi-trash size-14 m5r"></i> <i class="fi-trash size-14 m5r"></i>
<span translate>Remove transaction</span> <span translate>Remove transaction</span>

20
public/views/walletHome.html
View file

@ -12,7 +12,7 @@
<button class="button black expand" ng-click="$root.go('add')" translate>Create</button> <button class="button black expand" ng-click="$root.go('add')" translate>Create</button>
<div class="text-center text-gray p20v" ng-click="$root.go('preferences')"> <div class="text-center text-gray p20v" ng-click="$root.go('preferences')">
<button class=" outline dark-gray tiny" translate> Preferences </button> <button class=" outline round dark-gray tiny" translate> Preferences </button>
</div> </div>
</div> </div>
@ -105,7 +105,7 @@
ng-style="{'background-color':index.backgroundColor}">{{index.walletName | limitTo: 1}} ng-style="{'background-color':index.backgroundColor}">{{index.walletName | limitTo: 1}}
</div> </div>
<div class="right"> <div class="right">
<a ng-click="$root.go('preferences')" class="button outline light-gray tiny m0"> <a ng-click="$root.go('preferences')" class="button outline round light-gray tiny preferences-icon m0">
<i class="fi-widget size-18 vm"></i> <i class="fi-widget size-18 vm"></i>
<span class="show-for-medium-up" translate>Preferences</span> <span class="show-for-medium-up" translate>Preferences</span>
</a> </a>
@ -143,7 +143,7 @@
This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information. This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.
</div> </div>
<div class="text-center m10t "> <div class="text-center m10t ">
<span class="button outline dark-gray tiny" <span class="button outline round dark-gray tiny"
ng-click="index.recreate()"> ng-click="index.recreate()">
<span translate>Recreate</span> <span translate>Recreate</span>
</span> </span>
@ -195,13 +195,13 @@
</div> </div>
<div class="small-6 columns m20t"> <div class="small-6 columns m20t">
<span class="button expand outline dark-gray tiny" <span class="button expand outline round dark-gray tiny"
ng-click="home.skipBackup = true"> ng-click="home.skipBackup = true">
<span translate>SKIP BACKUP</span> <span translate>SKIP BACKUP</span>
</span> </span>
</div> </div>
<div class="small-6 columns m20t"> <div class="small-6 columns m20t">
<span class="button black expand radius tiny" <span class="button black expand round tiny"
ng-click="$root.go('backup')" ng-style="{'background-color':index.backgroundColor}" > ng-click="$root.go('backup')" ng-style="{'background-color':index.backgroundColor}" >
<span translate>Backup now</span> <span translate>Backup now</span>
</span> </span>
@ -236,7 +236,7 @@
</div> </div>
<div class="m10t text-center" ng-show="index.isCordova"> <div class="m10t text-center" ng-show="index.isCordova">
<span class="button outline dark-gray tiny" <span class="button outline dark-gray tiny round"
ng-click="home.shareAddress(home.addr)"> ng-click="home.shareAddress(home.addr)">
<i class="fi-share"></i> <i class="fi-share"></i>
<span translate>Share address</span> <span translate>Share address</span>
@ -249,7 +249,7 @@
</div> </div>
<div class="row m20t"> <div class="row m20t">
<div class="large-12 columns"> <div class="large-12 columns">
<button class="button black expand radius" ng-click="home.setNewAddress()" <button class="button black expand round" ng-click="home.setNewAddress()"
ng-style="{'background-color':index.backgroundColor}" ng-disabled="home.blockUx || index.isOffline ||home.generatingAddress" translate> ng-style="{'background-color':index.backgroundColor}" ng-disabled="home.blockUx || index.isOffline ||home.generatingAddress" translate>
Generate new address Generate new address
</button> </button>
@ -378,10 +378,10 @@
<div class="row" ng-show="!home.onGoingProcess"> <div class="row" ng-show="!home.onGoingProcess">
<div class="large-6 medium-6 small-6 columns" ng-show="!home.blockUx && (home._paypro || home.lockAddress)"> <div class="large-6 medium-6 small-6 columns" ng-show="!home.blockUx && (home._paypro || home.lockAddress)">
<a ng-click="home.resetForm(sendForm)" class="button expand outline dark-gray" translate>Cancel</a> <a ng-click="home.resetForm(sendForm)" class="button expand outline dark-gray round" translate>Cancel</a>
</div> </div>
<div class="columns" ng-class="{'small-6 medium-6 large-6':(home._paypro || home.lockAddress)}"> <div class="columns" ng-class="{'small-6 medium-6 large-6':(home._paypro || home.lockAddress)}">
<button type="submit" class="button black radius expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline" <button type="submit" class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline"
ng-style="{'background-color':index.backgroundColor}" translate> ng-style="{'background-color':index.backgroundColor}" translate>
Send Send
</button> </button>
@ -449,7 +449,7 @@
</div> </div>
</div> </div>
<div class="m20t columns text-center" ng-show="index.txHistoryPaging || index.updatingTxHistory"> <div class="m20t columns text-center" ng-show="index.txHistoryPaging || index.updatingTxHistory">
<button class="outline light-gray small expand m0" <button class="outline light-gray round small expand m0"
ng-click="index.updateTxHistory(index.skipHistory)" ng-click="index.updateTxHistory(index.skipHistory)"
ng-if="!index.updatingTxHistory"> ng-if="!index.updatingTxHistory">
<span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i> <span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i>

10
src/css/main.css
View file

@ -610,7 +610,6 @@ table tbody tr:last-child td {
button.outline, button.outline,
button.outline:hover, button.outline:hover,
button.outline:focus { button.outline:focus {
border-radius: 3px;
background: transparent; background: transparent;
} }
@ -620,7 +619,6 @@ button.outline:focus {
button.outline.tiny, button.outline.tiny,
button.outline.tiny:hover, button.outline.tiny:hover,
button.outline.tiny:focus { button.outline.tiny:focus {
border-radius: 3px;
background: transparent; background: transparent;
} }
@ -662,7 +660,6 @@ button.secondary:focus,
.button.secondary:focus { .button.secondary:focus {
background-color: #008CC1; background-color: #008CC1;
color: #fff; color: #fff;
border-radius: 3px;
} }
/* PRIMARY */ /* PRIMARY */
@ -674,7 +671,6 @@ button.primary:focus,
.button.primary:focus { .button.primary:focus {
background-color: #1ABC9C; background-color: #1ABC9C;
color: #fff; color: #fff;
border-radius: 3px;
} }
/* WARNING */ /* WARNING */
@ -686,7 +682,6 @@ button.warning:focus,
.button.warning:focus { .button.warning:focus {
background-color: #ED4A43; background-color: #ED4A43;
color: #fff; color: #fff;
border-radius: 3px;
} }
/* WHITE */ /* WHITE */
@ -701,6 +696,7 @@ button.black,
.button.black { .button.black {
background-color: #2C3E50; background-color: #2C3E50;
color: #fff; color: #fff;
border: 1px solid transparent;
} }
/* GRAY */ /* GRAY */
@ -1138,6 +1134,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
cursor: pointer !important; cursor: pointer !important;
} }
.preferences-icon {
padding: 0.6rem 0.8rem !important;
}
.passModal { .passModal {
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.50); box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.50);

1
src/css/mobile.css
View file

@ -256,6 +256,7 @@ a.missing-copayers {
.button, button { .button, button {
padding: 1rem 1.2rem 1.0625rem; padding: 1rem 1.2rem 1.0625rem;
border: 1px solid transparent;
} }
.box-setup { .box-setup {