Skip to content

Commit

Permalink
Merge branch 'release/1.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
joeworkman committed Jul 21, 2020
2 parents 71f3144 + e433cd2 commit f31eb07
Show file tree
Hide file tree
Showing 9 changed files with 3,549 additions and 3,588 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js
node_js:
- "0.12"
- "4"
- "5"
- "6"
- "7"
- "8"
- "10"
- "12"
- "node"
2 changes: 1 addition & 1 deletion helpers/code.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ module.exports = function(language, options) {

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

return format('<div class="code-example"><pre><code class="%s">%s</code></pre></div>', language, code);
return format('<div class="code-example"><pre><code class="%s hljs">%s</code></pre></div>', language, code);
}
2 changes: 1 addition & 1 deletion helpers/markdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var marked = require('marked');
if (typeof language === 'undefined') language = 'html';

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

return output;
};
Expand Down
Loading

0 comments on commit f31eb07

Please sign in to comment.