From ff0a87c671edef6c4a0b9a1f4445e62d902d3987 Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Mon, 20 Jan 2014 12:33:01 -0300 Subject: [PATCH 1/2] grunt-nodemon options updated to the new version --- Gruntfile.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index e83a514..850dd20 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -63,11 +63,10 @@ module.exports = function(grunt) { nodemon: { dev: { + script: 'server.js', options: { - file: 'server.js', args: [], - ignoredFiles: ['public/**', 'test/**','util/**'], - watchedExtensions: ['js'], + ignore: ['public/**', 'test/**','util/**'], // nodeArgs: ['--debug'], delayTime: 1, env: { @@ -95,7 +94,7 @@ module.exports = function(grunt) { //Default task(s). grunt.registerTask('default', ['jshint','concurrent']); - + //Test task. grunt.registerTask('test', ['env:test', 'mochaTest']); }; From 685b0a277d4626fbf5a998b10444769cb2dffc73 Mon Sep 17 00:00:00 2001 From: Bechi Date: Mon, 20 Jan 2014 12:38:51 -0300 Subject: [PATCH 2/2] fix block page --- public/css/common.css | 6 ++--- public/views/block.html | 52 +++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/public/css/common.css b/public/css/common.css index b069739..af3ab74 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -101,7 +101,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { background-color: #F4F4F4; padding: 15px; margin-top: 10px; - width: 360px; + width: 265px; height: 89%; border-radius: 5px; } @@ -124,8 +124,8 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { } .col-gray .address { - float: right; - width: 150px; + line-height: 20px; + width: 125px; } .block-id { diff --git a/public/views/block.html b/public/views/block.html index 8d85c85..d3db901 100644 --- a/public/views/block.html +++ b/public/views/block.html @@ -1,6 +1,6 @@
-
+
@@ -9,38 +9,34 @@

Block #{{ block.height }}

-
-
-

Hashes

-
-
- - - - - - - - - - - - - - - - - - - -
Hash{{block.hash}}
Previous Block{{block.previousblockhash}}
Next Block{{block.nextblockhash}}
Merkle Root

{{block.merkleroot}}

-
+
+

Hashes

+ + + + + + + + + + + + + + + + + + + +
Hash {{block.hash}}
Previous Block{{block.previousblockhash}}
Next Block{{block.nextblockhash}}
Merkle Root

{{block.merkleroot}}

-
+

Summary