Backporting to beta (#3176)

* Linux build case sensitivity fix (#3161)

* Make the footer a bit less ugly. (#3160)

* Make the footer a bit less ugly.

* Whitespace.

* Enabling personal RPC over IPC by default (#3165)

* Push precompiled for beta/stable, npm only master (#3163)

* Push precompiled for beta/stable, npm only master

* Release to npm before comitting updates

* Fixes #3171 (#3175)

* Remove extra cd js (#3177)

* Back to real root (#3178)
This commit is contained in:
Arkadiy Paronyan
2016-11-04 14:12:15 +01:00
committed by GitHub
parent 11f2b5d0ae
commit 19d0905cbd
10 changed files with 46 additions and 41 deletions

View File

@@ -539,7 +539,7 @@ export default class GasPriceSelector extends Component {
const gasPriceBIdx = gasPriceAIdx + 1;
if (gasPriceBIdx === N + 1) {
const gasPrice = gasPrices[gasPriceAIdx];
const gasPrice = gasPrices[gasPriceAIdx].round();
this.props.onChange(event, gasPrice);
return;
}
@@ -548,7 +548,9 @@ export default class GasPriceSelector extends Component {
const gasPriceB = gasPrices[gasPriceBIdx];
const mult = Math.round((sliderValue % 1) * 100) / 100;
const gasPrice = gasPriceA.plus(gasPriceB.minus(gasPriceA).times(mult));
const gasPrice = gasPriceA
.plus(gasPriceB.minus(gasPriceA).times(mult))
.round();
this.setSliderValue(sliderValue, gasPrice);
this.props.onChange(event, gasPrice);

View File

@@ -411,6 +411,7 @@ export default class Transfer extends Component {
const { api } = this.context;
const { account } = this.props;
const { data, gas, gasPrice, recipient, value } = this.state;
const options = {
from: account.address,
to: recipient,

View File

@@ -14,4 +14,4 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
export default from './CopyToClipboard';
export default from './copyToClipboard';

View File

@@ -15,12 +15,10 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.status {
padding: 1.5em;
text-align: right;
color: #ddd;
display: flex;
flex-direction: column;
align-items: flex-end;
padding: 0.5em;
font-size: x-small;
color: #ccc;
background-color: rgba(0, 0, 0, 0.2)
}
.title {
@@ -29,12 +27,13 @@
.enode {
word-wrap: break-word;
margin: 0.5em 0 0.25em 0;
float: right;
}
.enode > * {
display: inline-block;
margin-left: .5em;
margin: 0.25em 0.5em;
vertical-align: top;
}
.block {
@@ -43,9 +42,7 @@
.netinfo {
display: flex;
align-items: center;
flex-direction: row;
justify-content: flex-end;
margin-top: 0.25em;
color: #ddd;
}
.netinfo > * {
@@ -73,6 +70,8 @@
}
.version {
padding: 0.25em 0.5em;
float: left;
}
.syncing {

View File

@@ -48,15 +48,13 @@ class Status extends Component {
</div>
{ this.renderEnode() }
<div className={ styles.netinfo }>
<div>
<BlockStatus />
<div className={ styles.peers }>
{ netPeers.active.toFormat() }/{ netPeers.connected.toFormat() }/{ netPeers.max.toFormat() } peers
</div>
</div>
<BlockStatus />
<div className={ netStyle }>
{ isTest ? 'test' : netChain }
</div>
<div className={ styles.peers }>
{ netPeers.active.toFormat() }/{ netPeers.connected.toFormat() }/{ netPeers.max.toFormat() } peers
</div>
</div>
</div>
);