Browse Source

equal balance boxes height

all-modes
pbca26 8 years ago
parent
commit
e92185997f
  1. 6
      react/src/components/dashboard/walletsBalance/walletsBalance.render.js
  2. 21
      react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js
  3. 8
      react/src/components/dashboard/walletsNativeSend/walletsNativeSend.render.js
  4. 22
      react/src/components/overrides.scss

6
react/src/components/dashboard/walletsBalance/walletsBalance.render.js

@ -5,8 +5,8 @@ import Config from '../../../config';
const WalletsBalanceRender = function() {
return (
<div id="wallet-widgets">
<div className="col-xs-12">
<div id="wallet-widgets" className="wallet-widgets">
<div className="col-xs-12 flex">
<div className={ this.isFullMode() && !this.isFullySynced() ? 'col-xs-12' : 'col-xs-12 hide' }>
<div className="alert alert-info alert-dismissible">
<h4>{ translate('INDEX.ACTIVATING_WALLET_RT') }</h4>
@ -23,7 +23,7 @@ const WalletsBalanceRender = function() {
</div>
</div>
<div className={ this.isNativeMode() ? 'col-lg-3 col-xs-12' : this.isBasiliskMode() ? 'col-lg-4 col-xs-12' : 'col-lg-12 col-xs-12'}>
<div className={ this.isNativeMode() ? 'col-lg-3 col-xs-12' : this.isBasiliskMode() ? 'col-lg-4 col-xs-12' : 'col-lg-12 col-xs-12' }>
<div className="widget widget-shadow">
<div className="widget-content">
<i

21
react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js

@ -27,12 +27,14 @@ class WalletsNativeSend extends React.Component {
amount: 0,
fee: 0.0001,
addressSelectorOpen: false,
renderAddressDropdown: true,
};
this.updateInput = this.updateInput.bind(this);
this.handleSubmit = this.handleSubmit.bind(this);
this.openDropMenu = this.openDropMenu.bind(this);
this.getOAdress = this.getOAdress.bind(this);
this.handleClickOutside = this.handleClickOutside.bind(this);
this.checkZAddressCount = this.checkZAddressCount.bind(this);
}
componentWillMount() {
@ -51,6 +53,10 @@ class WalletsNativeSend extends React.Component {
);
}
componentWillReceiveProps() {
this.checkZAddressCount();
}
handleClickOutside(e) {
if (e.srcElement.className !== 'btn dropdown-toggle btn-info' &&
(e.srcElement.offsetParent && e.srcElement.offsetParent.className !== 'btn dropdown-toggle btn-info') &&
@ -61,13 +67,14 @@ class WalletsNativeSend extends React.Component {
}
}
zAddressCount() {
return this.props.ActiveCoin.addresses &&
this.props.ActiveCoin.addresses.private &&
this.props.ActiveCoin.addresses.private.length;
console.log(this.props.ActiveCoin.addresses &&
this.props.ActiveCoin.addresses.private &&
this.props.ActiveCoin.addresses.private.length);
checkZAddressCount() {
if (this.props.ActiveCoin.addresses &&
(!this.props.ActiveCoin.addresses.private ||
this.props.ActiveCoin.addresses.private.length === 0)) {
this.setState({
renderAddressDropdown: false,
});
}
}
renderAddressByType(type) {

8
react/src/components/dashboard/walletsNativeSend/walletsNativeSend.render.js

@ -75,7 +75,7 @@ export const WalletsNativeSendRender = function() {
className="extcoin-send-form"
method="post"
autoComplete="off">
{ this.zAddressCount &&
{ this.state.renderAddressDropdown &&
<div className="row">
<div className="col-xlg-12 form-group form-material">
<label className="control-label">{ translate('INDEX.SEND_FROM') }</label>
@ -104,7 +104,7 @@ export const WalletsNativeSendRender = function() {
<label
className="control-label"
htmlFor="kmdWalletAmount">
{ this.props.ActiveCoin.coin }
{ translate('INDEX.AMOUNT') }
</label>
<input
type="text"
@ -133,8 +133,8 @@ export const WalletsNativeSendRender = function() {
</div>
<div className="col-lg-12">
<span>
<strong>{ translate('INDEX.TOTAL') }:</strong>
{ this.state.amount } - { this.state.fee }/kb = { Number(this.state.amount) - Number(this.state.fee) }
<strong>{ translate('INDEX.TOTAL') }:</strong>&nbsp;
{ this.state.amount } - { this.state.fee }/kb = { Number(this.state.amount) - Number(this.state.fee) }&nbsp;
{ this.props.ActiveCoin.coin }
</span>
</div>

22
react/src/components/overrides.scss

@ -648,4 +648,26 @@ select{
position: absolute;
right: 4px;
top: 3px;
}
@media only screen and (min-width : 1201px) {
.wallet-widgets {
.flex {
display: flex;
flex-wrap: wrap;
}
> div {
display: flex;
.widget,
.widget-content {
height: 100%;
> div,
.clearfix {
height: 100%;
}
}
}
}
}
Loading…
Cancel
Save