diff --git a/react/src/components/addcoin/addcoin.js b/react/src/components/addcoin/addcoin.js index 24999f7..e2816e6 100644 --- a/react/src/components/addcoin/addcoin.js +++ b/react/src/components/addcoin/addcoin.js @@ -413,12 +413,10 @@ class AddCoin extends React.Component { { this.renderCoinSelectors() }
1 ? 'col-sm-12' : 'hide' } - style={{ textAlign: 'center', margin: '20px 0' }}> + className={'text-align-center vertical-margin-20 horizontal-margin-0 ' + (this.state.coins.length > 1 ? 'col-sm-12' : 'hide') }>
diff --git a/react/src/components/addcoin/addcoin.scss b/react/src/components/addcoin/addcoin.scss index 2497960..09e970f 100644 --- a/react/src/components/addcoin/addcoin.scss +++ b/react/src/components/addcoin/addcoin.scss @@ -1,3 +1,17 @@ .add-coin-modal { color: #757575; +} + +.vertical-margin-20 { + margin-top: 20px; + margin-bottom: 20px; +} + +.horizontal-margin-0 { + margin-left: 0; + margin-right: 0; +} + +.float-none { + float: none; } \ No newline at end of file diff --git a/react/src/components/dashboard/dashboard.scss b/react/src/components/dashboard/dashboard.scss index 9010d71..4d98327 100755 --- a/react/src/components/dashboard/dashboard.scss +++ b/react/src/components/dashboard/dashboard.scss @@ -26,7 +26,7 @@ } //navbar.js -.navbar-toolbar>li>a.padding-top-16 { +.navbar-toolbar > li > a.padding-top-16 { padding-top: 16px; } @@ -40,6 +40,34 @@ overflow-y: scroll; } +//sendCoin.js +.vertical-padding-10 { + padding-top: 10px; + padding-bottom: 10px; +} + +.horizontal-padding-0 { + padding-left: 0; + padding-right: 0; +} + +.confirm-currency-send-container { + color: #f44336; +} + +//settings.js +.wallet-info-key { + font-weight: bold; +} + +.width-5-percent { + width: 5%; +} + +.text-align-left { + text-align: left; +} + //walletsBalance.js .font-weight-600 { font-weight: 600; @@ -60,4 +88,46 @@ .no-padding { padding: 0 !important; +} + +.font-size-80-percent { + font-size: 80%; +} + +//walletsData.js +z-index-10 { + z-index: 10; +} + +full-width { + width: 100%; +} + +.pagination-container { + padding: 20px 0 10px 0; +} + +//walletsHeader.js +.z-index-1 { + z-index: 1; +} + +//walletsNative.js +.background-color-white { + background-color: #fff; +} + +.easydex-section-image { + font-size: 35px; + vertical-align: middle; +} + +//walletsNativeSyncProgress.js +.sync-progress-container { + margin: -20px 0px 10px 0px; +} + +//walletsNativeTxInfo.js +.height-170 { + height: 170px; } \ No newline at end of file diff --git a/react/src/components/dashboard/sendCoin.js b/react/src/components/dashboard/sendCoin.js index 2e69531..706b3df 100644 --- a/react/src/components/dashboard/sendCoin.js +++ b/react/src/components/dashboard/sendCoin.js @@ -164,19 +164,17 @@ class SendCoin extends React.Component {
{ translate('SEND.NEXT_UPDATE_IN') } { secondsElapsedToString(600 - timestamp) }s
+ className={'full-width margin-bottom-10 margin-top-10 ' + (this.state.currentStackLength === 1 || (this.state.currentStackLength === 0 && this.state.totalStackLength === 0) ? 'hide' : 'progress progress-sm') }>
{ translate('SEND.PROCESSING_REQ') }: { this.state.currentStackLength } / { this.state.totalStackLength }
@@ -642,8 +640,8 @@ class SendCoin extends React.Component { return items; } else { return ( -
-
+
+
{ translate('SEND.PROCESSING_TRANSACTION') }...
{ translate('SEND.NOTE_IT_WILL_TAKE') }.
@@ -778,7 +776,7 @@ class SendCoin extends React.Component { return (
-
+
@@ -916,7 +914,7 @@ class SendCoin extends React.Component { { translate('INDEX.FROM') }
{ this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] }
-
+
{ Number(this.state.amount) - Number(this.state.fee) } { this.props.ActiveCoin.coin }
diff --git a/react/src/components/dashboard/settings.js b/react/src/components/dashboard/settings.js index c140ddd..7c72386 100644 --- a/react/src/components/dashboard/settings.js +++ b/react/src/components/dashboard/settings.js @@ -120,7 +120,7 @@ class Settings extends React.Component { aria-labelledby="DebugLog" role="tabpanel">
-
+
{ translate('SETTINGS.APP_RELEASE') }
@@ -134,7 +134,7 @@ class Settings extends React.Component {
-
+
{ translate('SETTINGS.SYS_INFO') }
@@ -160,7 +160,7 @@ class Settings extends React.Component {
-
+
{ translate('SETTINGS.LOCATIONS') }
@@ -245,20 +245,20 @@ class Settings extends React.Component { if (typeof _appConfig[key] === 'object') { items.push( - + { key } - + ); for (let _key in _appConfig[key]) { items.push( - + { _key } - + - + { key } - + +
@@ -338,37 +338,37 @@ class Settings extends React.Component { - pubkey + pubkey
{ this.props.Main.activeHandle.pubkey }
- btcpubkey + btcpubkey
{ this.props.Main.activeHandle.btcpubkey }
- rmd160 + rmd160
{ this.props.Main.activeHandle.rmd160 }
- NXT + NXT
{ this.props.Main.activeHandle.NXT }
- notary + notary
{ this.props.Main.activeHandle.notary }
- status + status
{ this.props.Main.activeHandle.status }
@@ -411,7 +411,7 @@ class Settings extends React.Component {
-
+
-
+
-
+
-
+
-
+
-
+
- BTC diff --git a/react/src/components/dashboard/walletsNative.js b/react/src/components/dashboard/walletsNative.js index 9951832..1d9b4a3 100644 --- a/react/src/components/dashboard/walletsNative.js +++ b/react/src/components/dashboard/walletsNative.js @@ -27,12 +27,12 @@ class WalletsNative extends React.Component { this.props.ActiveCoin && this.props.ActiveCoin.mode === 'native') { return ( -
-
-
+
+
+
  1. - { this.props.ActiveCoin.coin } + { this.props.ActiveCoin.coin }
diff --git a/react/src/components/dashboard/walletsNativeBalance.js b/react/src/components/dashboard/walletsNativeBalance.js index 313078c..40e825d 100644 --- a/react/src/components/dashboard/walletsNativeBalance.js +++ b/react/src/components/dashboard/walletsNativeBalance.js @@ -16,9 +16,8 @@ class WalletsNativeBalance extends React.Component { { translate('INDEX.TRANSPARENT_BALANCE') }
{ this.props.ActiveCoin.balance.transparent ? this.props.ActiveCoin.balance.transparent : '-' } + className="pull-right padding-top-10 font-size-22" + id="kmd_transparent_balance">{ this.props.ActiveCoin.balance.transparent ? this.props.ActiveCoin.balance.transparent : '-' }
@@ -34,9 +33,8 @@ class WalletsNativeBalance extends React.Component { { translate('INDEX.Z_BALANCE') }
{ this.props.ActiveCoin.balance.private ? this.props.ActiveCoin.balance.private : '-' } + className="pull-right padding-top-10 font-size-22" + id="kmd_private_balance">{ this.props.ActiveCoin.balance.private ? this.props.ActiveCoin.balance.private : '-' }
@@ -52,9 +50,8 @@ class WalletsNativeBalance extends React.Component { { translate('INDEX.INTEREST_EARNED') }
{ this.props.ActiveCoin.balance.interest ? this.props.ActiveCoin.balance.interest : '-' } + className="pull-right padding-top-10 font-size-22" + id="kmd_total_interest_balance">{ this.props.ActiveCoin.balance.interest ? this.props.ActiveCoin.balance.interest : '-' }
@@ -70,9 +67,8 @@ class WalletsNativeBalance extends React.Component { { translate('INDEX.ZT_BALANCE') }
{ this.props.ActiveCoin.balance.total ? this.props.ActiveCoin.balance.total : '-' } + className="pull-right padding-top-10 font-size-22" + id="kmd_total_tz_balance">{ this.props.ActiveCoin.balance.total ? this.props.ActiveCoin.balance.total : '-' }
diff --git a/react/src/components/dashboard/walletsNativeSyncProgress.js b/react/src/components/dashboard/walletsNativeSyncProgress.js index d13c538..18b1f86 100644 --- a/react/src/components/dashboard/walletsNativeSyncProgress.js +++ b/react/src/components/dashboard/walletsNativeSyncProgress.js @@ -7,25 +7,23 @@ class WalletsNativeSyncProgress extends React.Component { this.props.Dashboard.progress.longestchain === 0) { return (
{ translate('INDEX.SYNC_ERR_LONGESTCHAIN') } + className="full-width">{ translate('INDEX.SYNC_ERR_LONGESTCHAIN') }
); } else if (this.props.Dashboard.progress.blocks === 0) { return (
{ translate('INDEX.SYNC_ERR_BLOCKS') } + className="full-width">{ translate('INDEX.SYNC_ERR_BLOCKS') }
); } else { @@ -33,8 +31,8 @@ class WalletsNativeSyncProgress extends React.Component { return (
+ className="alert alert-info alert-dismissible margin-bottom-40" + id="extcoin-wallet-activating-alert"> @@ -109,7 +106,7 @@ class WalletsNativeSyncProgress extends React.Component { return (
{ this.renderChainActivationNotification() } -
+
{ this.renderSyncPercentagePlaceholder() } diff --git a/react/src/components/dashboard/walletsNativeTxInfo.js b/react/src/components/dashboard/walletsNativeTxInfo.js index be197c2..33d9ff0 100644 --- a/react/src/components/dashboard/walletsNativeTxInfo.js +++ b/react/src/components/dashboard/walletsNativeTxInfo.js @@ -41,7 +41,7 @@ class WalletsNativeTxInfo extends React.Component {