Skip to content
This repository was archived by the owner on Sep 5, 2020. It is now read-only.

Commit 3ef3c5d

Browse files
evertonfragaevertonfraga
authored
Merge pull request #3080 from ethereum/develop
Update Master Branch with latest develop changes
2 parents a17b8f1 + 8688a18 commit 3ef3c5d

25 files changed

+419
-214
lines changed

‎interface/client/styles/layout.import.less‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,21 +121,15 @@ html {
121121
background: #FFF;
122122
overflow: hidden;
123123
opacity: 1;
124-
z-index:10;
124+
z-index: 10;
125125

126126
&.hidden {
127-
visibility: hidden;
128-
z-index: 1;
129-
webview {
130-
height: 0;
131-
}
127+
z-index: 0;
132128
}
133129

134130
&.app-bar-transparent webview {
135131
top: 0;
136132
margin-top: 0;
137-
// Temporary fix. See https://github.com/electron/electron/issues/5110
138-
flex: 0 1;
139133
}
140134
}
141135

‎interface/client/styles/menu.import.less‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ aside.sidebar {
5757
> ul {
5858
margin: 6px 0;
5959
padding: 0;
60-
width: 55px;
60+
width: 54px;
6161

6262
> li {
6363
overflow: hidden;
64-
margin-bottom: 15px;
64+
margin-bottom: 14px;
6565
transition-delay: 200ms;
6666

6767
// draggable LI
@@ -85,7 +85,7 @@ aside.sidebar {
8585
}
8686
}
8787
button.main {
88-
height: 54px;
88+
height: 55px;
8989
width: 54px;
9090
display: block;
9191
opacity: .6;
@@ -314,4 +314,3 @@ aside.sidebar {
314314
.app-blur aside.newsidebar nav::after {
315315
background-image: linear-gradient(to bottom, rgba(246, 246, 246, 0) 0%, rgba(246, 246, 246, 1) 100%);
316316
}
317-

‎interface/client/templates/elements/nodeInfo.js‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,12 @@ Template['elements_nodeInfo'].onCreated(function(){
105105
});
106106

107107

108-
Template['elements_nodeInfo'].onDestroyed(function(){
108+
Template['elements_nodeInfo'].onDestroyed(function() {
109109
Meteor.clearInterval(this.peerCountIntervalId);
110110

111-
if(this.syncFilter)
111+
if (this.syncFilter) {
112112
this.syncFilter.stopWatching();
113+
}
113114
});
114115

115116

@@ -120,28 +121,32 @@ Template['elements_nodeInfo'].helpers({
120121
@method (formattedBlockNumber)
121122
@return {String}
122123
*/
123-
'formattedBlockNumber': function() {
124+
formattedBlockNumber: function () {
124125
return numeral(EthBlocks.latest.number).format('0,0');
125126
},
126127
/**
127128
Formats the time since the last block
128129
129130
@method (timeSinceBlock)
130131
*/
131-
'timeSinceBlock': function () {
132-
var timeSince = moment(EthBlocks.latest.timestamp, "X");
132+
timeSinceBlock: function () {
133+
var timeSince = moment(EthBlocks.latest.timestamp, 'X');
133134
var now = moment();
134-
var diff = now.diff(timeSince, "seconds");
135+
var diff = now.diff(timeSince, 'seconds');
136+
137+
if (!EthBlocks.latest.timestamp) {
138+
return '-';
139+
}
135140

136-
if (diff>60) {
137-
Helpers.rerun["10s"].tick();
141+
if (diff > 60) {
142+
Helpers.rerun['10s'].tick();
138143
return timeSince.fromNow(true);
139-
} else if (diff<2) {
140-
Helpers.rerun["1s"].tick();
141-
return ' <span class="blue">' + TAPi18n.__('mist.nodeInfo.blockReceivedShort') + '</span>'
142-
} else {
143-
Helpers.rerun["1s"].tick();
144-
return diff + "s";
144+
} else if (diff < 2) {
145+
Helpers.rerun['1s'].tick();
146+
return ' <span class="blue">' + TAPi18n.__('mist.nodeInfo.blockReceivedShort') + '</span>';
145147
}
148+
149+
Helpers.rerun['1s'].tick();
150+
return diff + 's';
146151
}
147152
});

‎interface/i18n/app.it.i18n.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"sending": "Inviando...",
2121
"create": "Crea",
2222
"tryToReconnect": "Prova a riconnetterti",
23-
"stayAnonymous": "Stay anonymous",
24-
"authorize": "Authorize"
23+
"stayAnonymous": "Rimani anonimo",
24+
"authorize": "Autorizza"
2525
},
2626
"commonWords": {
2727
"you": "Tu",
@@ -33,4 +33,4 @@
3333
"on": "su",
3434
"per": "per"
3535
}
36-
}
36+
}

‎interface/i18n/mist.de.i18n.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"ethereumNode": "Ethereum Softwareknoten",
4848
"network": "Netzwerk",
4949
"mainNetwork": "Hauptnetzwerk",
50-
"startMining": "⛏ Mining starten (nur auf Testnetz)",
50+
"startMining": "⛏ Mining starten",
5151
"stopMining": "⛏ Mining stoppen",
5252
"externalNode": "externer Softwareknoten aktiv",
5353
"nodeMode": "Chain herunterladen",

‎interface/i18n/mist.en.i18n.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"nodeMode": "Chain download",
7070
"fullNode": "Store full blockchain",
7171
"lightNode": "Use light Node (experimental!)",
72-
"startMining": "⛏ Start mining (Testnet only)",
72+
"startMining": "⛏ Start mining",
7373
"stopMining": "⛏ Stop mining"
7474
},
7575
"window": {

‎interface/i18n/mist.es.i18n.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"ethereumNode": "Nodo de Ethereum",
4747
"network": "Red",
4848
"mainNetwork": "Red principal",
49-
"startMining": "⛏ Empezar a minar (sólo Testnet)",
49+
"startMining": "⛏ Empezar a minar",
5050
"stopMining": "⛏ Parar de minar",
5151
"externalNode": "using external node",
5252
"openRemix": "Open Remix IDE",

‎interface/i18n/mist.fa.i18n.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"ethereumNode": "Ethereum Node",
4848
"network": "Network",
4949
"mainNetwork": "Main Network",
50-
"startMining": "⛏ Start Mining (Testnet only)",
50+
"startMining": "⛏ Start Mining",
5151
"stopMining": "⛏ Stop Mining",
5252
"openRemix": "Open Remix IDE",
5353
"nodeMode": "Chain download",

‎interface/i18n/mist.fr.i18n.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"ethereumNode": "Nœud Ethereum",
4747
"network": "Réseau",
4848
"mainNetwork": "Réseau principal",
49-
"startMining": "⛏ Commencer à miner (seulement pour Testnet)",
49+
"startMining": "⛏ Commencer à miner",
5050
"stopMining": "⛏ Arrêter de miner",
5151
"externalNode": "using external node",
5252
"openRemix": "Open Remix IDE",

‎interface/i18n/mist.it.i18n.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"ethereumNode": "Nodo Ethereum",
4747
"network": "Rete",
4848
"mainNetwork": "Rete principale",
49-
"startMining": "⛏ Inizia mining (solo Testnet)",
49+
"startMining": "⛏ Inizia mining",
5050
"stopMining": "⛏ Ferma mining",
5151
"externalNode": "using external node",
5252
"openRemix": "Open Remix IDE",

0 commit comments

Comments
 (0)