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

Merge pull request #6340 from gabrielbazan7/ref/capitalize

Browse source 
Ref/capitalize
This commit is contained in:
Gustavo Maximiliano Cortez 2017-06-30 16:06:56 -03:00 • committed by GitHub
commit 312bf59888
9 changed files with 9 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/services/onGoingProcess.js
View file

@ -17,8 +17,8 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
'creatingTx': gettext('Creating transaction'),
'creatingWallet': gettext('Creating Wallet...'),
'deletingWallet': gettext('Deleting Wallet...'),
'extractingWalletInfo': gettext('Extracting Wallet Information...'),
'fetchingPayPro': gettext('Fetching Payment Information'),
'extractingWalletInfo': gettext('Extracting Wallet information...'),
'fetchingPayPro': gettext('Fetching payment information'),
'generatingCSV': gettext('Generating .csv file...'),
'gettingFeeLevels': gettext('Getting fee levels...'),
'importingWallet': gettext('Importing Wallet...'),

4
src/sass/views/bitpayCard.scss
View file

@ -52,10 +52,6 @@
width: 35px;
}
span {
text-transform: capitalize;
}
.big-icon-svg {
padding: 0 12px 0 0;
}

1
src/sass/views/includes/clickToAccept.scss
View file

@ -24,7 +24,6 @@ click-to-accept {
height: 100%;
width: 100%;
z-index: 4;
text-transform: capitalize;
-webkit-transform: translateY(2rem);
transform: translateY(2rem);
opacity: 0;

1
src/sass/views/includes/slideToAccept.scss
View file

@ -95,7 +95,6 @@ slide-to-accept {
width: 100%;
font-size: 17px;
letter-spacing: 0.02rem;
text-transform: capitalize;
-webkit-transform: translateY(2rem);
transform: translateY(2rem);
opacity: 0;

4
src/sass/views/includes/txp-details.scss
View file

@ -32,10 +32,6 @@
height: 35px;
width: 35px;
}
span {
text-transform: capitalize;
}
}
.amount-label{
line-height: 30px;

8
src/sass/views/integrations/amazon.scss
View file

@ -11,7 +11,7 @@
stroke: black;
fill: black;
}
.add-bottom-for-cta {
bottom: 92px;
}
@ -31,10 +31,6 @@
width: 35px;
}
span {
text-transform: capitalize;
}
.big-icon-svg {
margin-right: 0.6rem;
}
@ -80,7 +76,7 @@
color: $item-label-color;
margin-bottom: 8px;
}
.capitalized {
text-transform: capitalize;
}

4
src/sass/views/integrations/coinbase.scss
View file

@ -28,10 +28,6 @@
height: 35px;
width: 35px;
}
span {
text-transform: capitalize;
}
}
.amount-label{
line-height: 30px;

4
src/sass/views/integrations/glidera.scss
View file

@ -28,10 +28,6 @@
height: 35px;
width: 35px;
}
span {
text-transform: capitalize;
}
}
.amount-label{
line-height: 30px;

10
www/views/confirm.html
View file

@ -82,14 +82,14 @@
<span class="m10l">{{tx.txp[wallet.id].feeStr || '...'}}</span>
<span class="item-note m10l">
<span>{{tx.txp[wallet.id].alternativeFeeStr || '...'}}&nbsp;
<span class="fee-rate" ng-if="tx.txp[wallet.id].feeRatePerStr"> &middot;
<i class="ion-alert-circled warn" ng-show="tx.txp[wallet.id].feeToHigh"></i> &nbsp;
<span class="fee-rate" ng-if="tx.txp[wallet.id].feeRatePerStr"> &middot;
<i class="ion-alert-circled warn" ng-show="tx.txp[wallet.id].feeToHigh"></i> &nbsp;
<span class="fee-rate" ng-class="{'warn':tx.txp[wallet.id].feeToHigh}" translate> {{tx.txp[wallet.id].feeRatePerStr}} of the sending amount </span>
</span>
</span>
</span>
<i class="icon bp-arrow-right"></i>
</div>
<a class="item item-icon-right" ng-if="wallet" ng-click="showDescriptionPopup(tx)">
@ -125,7 +125,7 @@
slide-success-hide-on-confirm="true">
<span ng-show="wallet.m == 1 && (wallet.canSign() || wallet.isPrivKeyExternal())" translate>Payment Sent</span>
<span ng-show="wallet.m > 1 && (wallet.canSign() || wallet.isPrivKeyExternal())" translate>Proposal Created</span>
<span ng-show="!wallet.canSign() && !wallet.isPrivKeyExternal()" translate>Transaction created</span>
<span ng-show="!wallet.canSign() && !wallet.isPrivKeyExternal()" translate>Transaction Created</span>
</slide-to-accept-success>
<wallet-selector