Merge pull request #6340 from gabrielbazan7/ref/capitalize

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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