Skip to content

Commit f31eb07

Browse files
committed
Merge branch 'release/1.7.0'
2 parents 71f3144 + e433cd2 commit f31eb07

9 files changed

Lines changed: 3549 additions & 3588 deletions

File tree

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22
node_js:
3-
- "0.12"
4-
- "4"
5-
- "5"
63
- "6"
7-
- "7"
4+
- "8"
5+
- "10"
6+
- "12"
7+
- "node"

helpers/code.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ module.exports = function(language, options) {
1414

1515
var code = hljs.highlight(language, options.fn(this)).value;
1616

17-
return format('<div class="code-example"><pre><code class="%s">%s</code></pre></div>', language, code);
17+
return format('<div class="code-example"><pre><code class="%s hljs">%s</code></pre></div>', language, code);
1818
}

helpers/markdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var marked = require('marked');
1616
if (typeof language === 'undefined') language = 'html';
1717

1818
var renderedCode = hljs.highlight(language, code).value;
19-
var output = `<div class="code-example"><pre><code class="${language}">${renderedCode}</code></pre></div>`;
19+
var output = `<div class="code-example"><pre><code class="${language} hljs">${renderedCode}</code></pre></div>`;
2020

2121
return output;
2222
};

0 commit comments

Comments
 (0)