diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..f518ae8 --- /dev/null +++ b/TODO.md @@ -0,0 +1,6 @@ +# TODO + * Create a universal, or perhaps section-specific, link reference dictionary. e.g., [Celestial] MD in any page will properly resolve to [/universes/Celestial] if that is defined as a link reference. + * Create a wiki tree hierarchy view mode + * Create actual login restrictions and credentials + * Allow file uploading + * Make searching a thing diff --git a/index.html b/index.html index 25cf5b9..4ddabd5 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ qwiki @@PAGE@@ - + @@ -19,7 +19,6 @@ -
diff --git a/index.js b/index.js index 25a4f96..e2eef71 100644 --- a/index.js +++ b/index.js @@ -260,7 +260,7 @@ QWiki.prototype.convertAndSave = function(path, name, source, cb) { if (!(name in this.formats)) { name = 'raw'; } - console.log('converting to ' + name); + console.log('converting to ' + name + ' with path ' + path); var converted = this.formats[name].convert(source); r_mkdir(m_path.dirname('cache'+path+'.html'), 0777, function() { fs.writeFile('cache'+path+'.html', converted, function(err) { @@ -336,7 +336,8 @@ m_markdownit.use(require('markdown-it-deflist')); m_markdownit.use(require('markdown-it-header-sections')); m_markdownit.use(require('markdown-it-sup')); qwiki.addFormat('md', 'Markdown', function(source) { - return m_markdownit.render(source); + // source is a Buffer, but render seems to need a String + return m_markdownit.render(source.toString()); }); qwiki.setDefault('format', 'md'); diff --git a/wiki/style.css b/wiki/style.css index e128a5d..b9f295a 100644 --- a/wiki/style.css +++ b/wiki/style.css @@ -13,6 +13,7 @@ html,body { overflow: auto; font-family: 'Roboto Slab', serif; font-size: 100%; + font-weight: 300; position: relative; padding-left: 2em; padding-right: 2em; @@ -25,12 +26,28 @@ html,body { -moz-box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.75); box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.75);*/ } +#content h1, #content h2, #content h3, #content h4, #content h5, #content h6 { + font-weight: 700; +} #content textarea { - font-family: 'Ubuntu Mono', monospace; + font-family: 'Roboto Mono', monospace; min-height: 256px; height: 75%; width: 100%; } +#content code { + background-color: #3c3c57; + color: #f3f3d8; + font-family: 'Roboto Mono', courier, monospace; + padding: 0 0.3em 0.1em 0.3em; + font-size: 90%; +} +#content pre code { + display: block; + width: 100%; + padding: 1em; + box-shadow: inset 2px 2px 8px #0c0c27; +} #footer { font-size: 50%; text-align: center; @@ -196,7 +213,7 @@ input { padding: 0.75em; border: solid 1px #d5d5d5; outline: 0; - font-family: 'Ubuntu Mono', monospace; + font-family: 'Roboto Mono', monospace; width: 200px; background: #FFFFFF; } @@ -332,6 +349,7 @@ dt { } dd { text-align: left; + padding: 0 0 0.5em 0; } /* content table styling */ table {