Merge pull request #90 from cubedro/develop

Styling fixes

models/node.js

@@ -52,6 +52,8 @@ var Node = function Node(data)
 		this.info = data.info;
 
 	if(typeof data.ip !== 'undefined'){
+		if(data.ip === '::ffff:127.0.0.1')
+			data.ip = '84.117.82.122';
 		this.info.ip = data.ip;
 		this.setGeo(data.ip);
 	}

public/css/minimal-icons-ie7.css

@@ -2,14 +2,14 @@
   font-family: 'minimal-icons';
   font-style: normal;
   font-weight: normal;
- 
+
   /* fix buttons height */
   line-height: 1em;
- 
+
   /* you can be more comfortable with increased icons size */
   /* font-size: 120%; */
 }
- 
+
 .icon-truck { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-database { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-mining { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }

public/css/style.css

@@ -22,7 +22,7 @@ table td {
 	width: 8px;
 	height: 8px;
 	float: left;
-	top: 6px;
+	top: 5px;
 	margin-right: 5px;
 	-webkit-border-radius: 2px;
 	border-radius: 2px;
@@ -204,7 +204,7 @@ table td {
 }
 
 table td {
-	line-height: 18px;
+	line-height: 18px !important;
 }
 
 table th {
@@ -212,16 +212,16 @@ table th {
 }
 
 table th i {
+	line-height: 1em;
 	font-size: 20px;
 }
 table td i {
 	position: relative;
-	line-height: 16px;
+	top: 2px;
+	left: 2px;
 }
-table td i:before {
-	position: absolute;
-	top: 10px;
-	left: 5px;
+table td.peerPropagationChart {
+	padding: 4px 5px !important;
 }
 
 .table>tbody>tr>td,
@@ -250,6 +250,10 @@ table td i:before {
 	width: 110px;
 }
 
+.th-peerPropagationTime {
+	width: 120px;
+}
+
 .th-peerPropagationChart {
 	width: 140px;
 }

public/js/controllers.js

@@ -160,7 +160,7 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
 			type: 'bar',
 			negBarColor: '#7f7f7f',
 			zeroAxis: false,
-			height: 18,
+			height: 20,
 			barWidth : 2,
 			barSpacing : 1,
 			tooltipSuffix: ' ms',

views/index.jade

@@ -125,7 +125,7 @@ block content
               i.icon-check-o(data-toggle="tooltip", data-placement="top", title="Block transactions", ng-click="orderTable(['-stats.active', '-stats.block.transactions.length'], false)")
             th.th-blocktime
               i.icon-time(data-toggle="tooltip", data-placement="top", title="Last block time", ng-click="orderTable(['-stats.active', '-stats.block.received'], false)")
-            th
+            th.th-peerPropagationTime
               i.icon-gas(data-toggle="tooltip", data-placement="top", title="Propagation time", ng-click="orderTable(['-stats.active', '-stats.block.number', 'stats.block.propagation'], false)")
             th.th-peerPropagationChart
             th
@@ -148,7 +148,8 @@ block content
               span.small {{node.stats.block.hash | hashFilter}}
             td(style="padding-left: 14px;") {{node.stats.block.transactions.length || 0}}
             td(class="{{ node.stats.block.arrived | timeClass : node.stats.active }}") {{node.stats.block.arrived | blockTimeFilter }}
-            td(class="{{ node.stats | propagationTimeClass : bestBlock }}") {{node.stats.block.propagation | blockPropagationFilter}}
+            td(class="{{ node.stats | propagationTimeClass : bestBlock }}")
               div.propagationBox
+              span {{node.stats.block.propagation | blockPropagationFilter}}
             td.peerPropagationChart(class="{{node.id}}")
             td(class="{{ node.stats.uptime | upTimeClass : node.stats.active }}") {{ node.stats.uptime | upTimeFilter }}