Fixes claudioc#68, tables issue

charloco · Oct 17, 2015 · 2ded465 · 2ded465
1 parent 5ac9c5f
commit 2ded465
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 17 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,9 @@
+Version 1.4.1, October 17th, 2015
+=================================
+
+- Fixes #68, CSS support for markdown tables
+- Removes deprecated `licenses` object in packages.json
+
 Version 1.4.0, October 11th, 2015
 =================================
 

diff --git a/README.md b/README.md
@@ -69,7 +69,9 @@ For code syntax highlighting, Jingo uses the `node-syntaxhighlighter` module. Fo
 Installation
 ------------
 
-`npm install jingo` or download/clone the whole thing and run "npm install".
+`npm install jingo` or download/clone the whole thing and run `npm install`.
+
+Note: if you already have Jingo installed, please also run `npm prune` (some modules can be stale and need to be removed).
 
 Jingo needs a config file and to create a sample config file, just run `jingo -s`, redirect the output on a file and then edit it (`jingo -s > config.yaml`). The config file contains all the available configuration options. Be sure to provide a valid server hostname (like wiki.mycompany.com) if you use a 3rd party provider for authentication (like Google or GitHub). It is needed for them to be able to get back to you.
 

diff --git a/TODO b/TODO
diff --git a/jingo b/jingo
@@ -17,7 +17,7 @@ var program = require('commander'),
 
 global.Git = require('./lib/gitmech');
 
-program.version('1.4.0')
+program.version('1.4.1')
        .option('-c, --config <path>', 'Specify the config file')
        .option('-#, --hash-string <string>', 'Create an hash for a string')
        .option('-l, --local', 'Listen on localhost only')

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jingo",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "A nodejs based wiki engine (sort of Gollum port)",
   "author": "Claudio Cicali <[email protected]>",
   "keywords": [
@@ -35,7 +35,7 @@
     "jade": "*",
     "js-yaml": "^3.1.0",
     "lodash": "^2.4.1",
-    "marked": "^0.3.2",
+    "marked": "^0.3.5",
     "method-override": "^2.3.0",
     "morgan": "^1.5.0",
     "node-syntaxhighlighter": "*",
@@ -59,10 +59,5 @@
     "node": "0.8.x",
     "npm": "1.1.x"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://github.com/claudioc/jingo/raw/master/LICENSE"
-    }
-  ]
+  "license": "MIT"
 }
diff --git a/public/css/style.css b/public/css/style.css
@@ -154,6 +154,23 @@ hr {
   margin: 10px 0;
 }
 
+#content > table {
+  display: block;
+  width: 100%;
+  overflow: auto;
+  margin-bottom: 16px;
+}
+
+#content > table td,
+#content > table th {
+  padding: 6px 13px;
+  border: 1px solid #ddd;
+}
+
+#content > table thead {
+  background-color: #eee;
+}
+
 .history td:first-child {
   width: 10px;
 }