Skip to content

Commit

Permalink
Pretty much rewrite everything.
Browse files Browse the repository at this point in the history
Really should've committed this as I went along but it was all too
messy and none of it worked until very recently.

This is pretty much a chuck-everything-out-the-window-and-rewrite-it job.
Various bits have been kept around but a lot has been redone from scratch.

 * Swap showdown out for markdown-it (which is nicer to use and
   better-maintained than marked)
 * Use various modules like ejs to get rid of lots of stuff done in-house
 * Kill off pygments and use highlight.js. This changes the languages
   available for highlighting, but makes everything waaaaay faster, easier
   to work with, and doesn't require the messy pygments child process stuff.
   It also changes the available colour schemes, which isn't great, sorry :(
 * Some messy stuff that I still want to clean up for grabbing colour schemes
   straight from the highlight.js styles and feeding them into LESS
 * Oh yeah, switch from sass to less for styles because native node = yay

This has been done in pretty much exactly the wrong style: lots of code,
a lot of which *isn't* self-explanatory, and not many comments. Before I
get this into master I'll make sure it's up-to-scratch with comments.
  • Loading branch information
jbt committed Aug 3, 2015
1 parent 29e129d commit a31e7c9
Show file tree
Hide file tree
Showing 50 changed files with 1,150 additions and 8,986 deletions.
1,360 changes: 0 additions & 1,360 deletions lib/showdown.js

This file was deleted.

12 changes: 10 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,21 @@
"mkdirp": "0.3.2",
"commander": "0.5.2",
"watchr": "~2.3.3",
"pygmentize-bundled": "~2.1.0"
"markdown-it": "^4.4.0",
"less": "^2.5.1",
"ejs": "^2.3.3",
"extend": "^3.0.0",
"async": "^1.4.0",
"highlight.js": "^8.7.0",
"repeating": "^1.1.3",
"strip-indent": "^1.0.1",
"css": "^2.2.1"
},
"bin": {
"docker": "./docker"
},
"engines": {
"node": ">=0.4.0"
"node": ">=0.10.0"
},
"description": "Static documentation generator based on docco",
"homepage": "http://jbt.github.com/docker",
Expand Down
11 changes: 5 additions & 6 deletions res/code.jst → res/code.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@
<td class="code highlight"></td>
</tr>
<% } %>
<% for (var i=0, l=sections.length; i<l; i++) { %>
<% var section = sections[i]; %>
<% sections.forEach(function(section){ %>
<tr>
<td class="docs">
<%= section.docHtml %>
<%- section.docHtml %>
</td>
<td class="code highlight">
<%= section.codeHtml %>
<pre class="<%- language %>"><%- section.codeHtml %></pre>
</td>
</tr>
<% } %>
<% }); %>
</tbody>
</table>
</table>
308 changes: 0 additions & 308 deletions res/css/autumn.css

This file was deleted.

Loading

0 comments on commit a31e7c9

Please sign in to comment.