Merge branch 'ppoffice:master' into swedish
commit
3cb6e13edb
|
@ -166,7 +166,7 @@ module.exports = class extends Component {
|
|||
{rss ? <link rel="alternate" href={url_for(rss)} title={config.title} type="application/atom+xml" /> : null}
|
||||
{favicon ? <link rel="icon" href={url_for(favicon)} /> : null}
|
||||
<link rel="stylesheet" href={iconcdn()} />
|
||||
{hlTheme ? <link rel="stylesheet" href={cdn('highlight.js', '9.12.0', 'styles/' + hlTheme + '.css')} /> : null}
|
||||
{hlTheme ? <link rel="stylesheet" href={cdn('highlight.js', '11.7.0', 'styles/' + hlTheme + '.css')} /> : null}
|
||||
<link rel="stylesheet" href={fontCssUrl[variant]} />
|
||||
<link rel="stylesheet" href={url_for('/css/' + variant + '.css')} />
|
||||
<Plugins site={site} config={config} helper={helper} page={page} head={true} />
|
||||
|
|
|
@ -62,9 +62,9 @@
|
|||
$('figure.highlight').addClass('hljs');
|
||||
$('figure.highlight .code .line span').each(function() {
|
||||
const classes = $(this).attr('class').split(/\s+/);
|
||||
if (classes.length === 1) {
|
||||
$(this).addClass('hljs-' + classes[0]);
|
||||
$(this).removeClass(classes[0]);
|
||||
for (const cls of classes) {
|
||||
$(this).addClass('hljs-' + cls);
|
||||
$(this).removeClass(cls);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in New Issue