move main.css below hljs css (#195)

This commit is contained in:
Ricky Vetter 2017-10-30 10:55:39 -07:00 committed by Joel Marcey
parent 10e8c7cba3
commit 5263976ad3

View file

@ -17,9 +17,9 @@ class Head extends React.Component {
});
const highlightDefaultVersion = '9.12.0';
const highlightConfig = this.props.config.highlight
const highlightConfig = this.props.config.highlight
|| { version: highlightDefaultVersion, theme: 'default' };
const highlightVersion = highlightConfig.version || highlightDefaultVersion;
const highlightVersion = highlightConfig.version || highlightDefaultVersion;
const highlightTheme = highlightConfig.theme || 'default';
const hasCustomScripts = this.props.config.scripts;
@ -60,7 +60,7 @@ class Head extends React.Component {
)}
<link
rel="stylesheet"
href={this.props.config.baseUrl + "css/main.css"}
href={`//cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightVersion}/styles/${highlightTheme}.min.css`}
/>
{hasBlog && (
<link
@ -78,9 +78,11 @@ class Head extends React.Component {
title={this.props.config.title + " Blog RSS Feed"}
/>
)}
{/* Site defined code. Keep these at the end to avoid overriding. */}
<link
rel="stylesheet"
href={`//cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightVersion}/styles/${highlightTheme}.min.css`}
href={this.props.config.baseUrl + "css/main.css"}
/>
{hasCustomScripts && this.props.config.scripts.map(function(source) {
return (