fixed styling

lib/history.js

@@ -440,10 +440,10 @@ History.prototype.getGasLimit = function()
 {
 	var gasLimitHistory = _( this._items )
 		.sortByOrder( 'height', false )
-		.filter(function (item)
+		// .filter(function (item)
-		{
+		// {
-			return item.block.trusted;
+		// 	return item.block.trusted;
-		})
+		// })
 		.slice(0, MAX_BINS)
 		.reverse()
 		.map(function (item)
@@ -559,7 +559,7 @@ History.prototype.getMinersCount = function()
 
 	return _(minerCount)
 		.sortByOrder( 'blocks', false )
-		.slice(0, 5)
+		.slice(0, 2)
 		.value();
 }
 

src/css/style.css

@@ -343,7 +343,7 @@ nodepropagchart {
 	position: relative;
 	display: block;
 	width: 100%;
-	height: 282px;
+	height: 242px;
 	overflow: hidden;
 }
 

src/js/directives.js

@@ -211,13 +211,13 @@ angular.module('netStatsApp.directives', [])
 					element.empty();
 
 					var width = 628,
-						height = 244;
+						height = 202;
 
 					scope.map = new Datamap({
 						element: element[0],
 						scope: 'world',
 						width: width,
-						height: 300,
+						height: 242,
 						fills: {
 							success: '#7BCC3A',
 							info: '#10A0DE',

src/views/index.jade

@@ -60,44 +60,37 @@ block content
 
 
     div.row(ng-cloak)
-      div.col-xs-8.stats-boxes(style="padding-top: 0px;")
+      div.col-xs-12.stats-boxes(style="padding-top: 0px;")
         div.row.second-row
-          div.col-xs-3.stat-holder.box
+          div.col-xs-2.stat-holder.box
             div.active-nodes(class="{{ nodesActive | nodesActiveClass : nodesTotal }}")
               i.icon-node
               span.small-title active nodes
               span.small-value {{nodesActive}}/{{nodesTotal}}
-          //- div.col-xs-3.stat-holder.box
+          div.col-xs-2.stat-holder.box
-          //-   div.difficulty.text-info
-          //-     i.icon-difficulty
-          //-     span.small-title difficulty
-          //-     span.small-value {{ lastDifficulty | number }}
-          div.col-xs-3.stat-holder.box
             div.gasprice.text-info
               i.icon-gasprice
               span.small-title gas price
               span.small-value {{ bestStats.gasPrice.toString() | gasPriceFilter }}
-          div.col-xs-3.stat-holder.box
+          div.col-xs-2.stat-holder.box
-            div.page-latency(class="{{ {active: true, latency: latency} | latencyClass }}")
-              i.icon-clock
-              span.small-title page latency
-              span.small-value {{latency}} ms
-          div.col-xs-3.stat-holder.box
-            div.uptime(class="{{ upTimeTotal | upTimeClass : true }}")
-              i.icon-bulb
-              span.small-title uptime
-              span.small-value {{ upTimeTotal | upTimeFilter }}
-
-        div.row.second-row
-          div.col-xs-3.stat-holder.box
-          div.col-xs-3.stat-holder.box
             div.gasprice.text-info
               i.icon-gasprice
               span.small-title gas limit
               span.small-value {{ bestStats.block.gasLimit }} gas
-          div.col-xs-3.stat-holder.box
+          div.col-xs-2.stat-holder.box
-          div.col-xs-3.stat-holder.box
+            div.page-latency(class="{{ {active: true, latency: latency} | latencyClass }}")
+              i.icon-clock
+              span.small-title page latency
+              span.small-value {{latency}} ms
+          div.col-xs-2.stat-holder.box
+            div.uptime(class="{{ upTimeTotal | upTimeClass : true }}")
+              i.icon-bulb
+              span.small-title uptime
+              span.small-value {{ upTimeTotal | upTimeFilter }}
+          div.col-xs-2.stat-holder.box
 
+        div.row
+          div.col-xs-8
             div.row
               div.col-xs-3.stat-holder
                 div.big-info.chart(class="{{ avgBlockTime | avgTimeClass }}")
@@ -120,8 +113,8 @@ block content
                   //- span.small-value {{ blockPropagationAvg | blockPropagationFilter : '' }}
                   histogram.big-details.d3-blockpropagation(data="blockPropagationChart")
 
-          div.col-xs-3.stat-holder.pull-right
+              div.col-xs-3.stat-holder.xpull-right
-            div.big-info.chart.double-chart
+                div.big-info.chart.xdouble-chart
                   span.small-title last blocks miners
                   div.blocks-holder(ng-repeat='miner in miners track by miner.miner', data-toggle="tooltip", data-placement="right", data-original-title="{{miner.blocks}}")
                     div.block-count(class="{{miner.blocks | minerBlocksClass : 'text-'}}") {{miner.blocks}}
@@ -150,13 +143,6 @@ block content
                   span.small-title gas spending
                   sparkchart.big-details.spark-gasspending(data="{{gasSpending.join(',')}}")
 
-
-
-      div.col-xs-4.stat-holder.map-holder
-        //- div.col-xs-12
-        nodemap#mapHolder(data="map")
-
-    div.row
               div.col-xs-3.stat-holder
                 div.big-info.chart.text-info
                   //- i.icon-difficulty
@@ -164,7 +150,13 @@ block content
                   //- span.small-value {{ lastDifficulty | number }}
                   sparkchart.big-details.spark-difficulty(data="{{lastGasLimit.join(',')}}")
 
-    div.row
+
+
+          div.col-xs-4.stat-holder.map-holder
+            //- div.col-xs-12
+            nodemap#mapHolder(data="map")
+
+    //- div.row
       div.col-xs-12.stats-boxes
         div.row.second-row
           div.col-xs-12.stat-holder.box