Remove syntax-highlight-dark.css, it wasn't necessary

2 files changed, 2 insertions, 69 deletions

diff --git a/assets/css/syntax-highlight-dark.css b/assets/css/syntax-highlight-dark.css
deleted file mode 100644
index b581d2f..0000000
--- a/assets/css/syntax-highlight-dark.css
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Background */ .chroma { color: #f8f8f2; background-color: #272822 }

-/* Error */ .chroma .err { color: #960050; background-color: #1e0010 }

-/* LineTableTD */ .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; }

-/* LineTable */ .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; }

-/* LineHighlight */ .chroma .hl { display: block; width: 100%;background-color: #ffffcc }

-/* LineNumbersTable */ .chroma .lnt { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }

-/* LineNumbers */ .chroma .ln { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }

-/* Keyword */ .chroma .k { color: #66d9ef }

-/* KeywordConstant */ .chroma .kc { color: #66d9ef }

-/* KeywordDeclaration */ .chroma .kd { color: #66d9ef }

-/* KeywordNamespace */ .chroma .kn { color: #f92672 }

-/* KeywordPseudo */ .chroma .kp { color: #66d9ef }

-/* KeywordReserved */ .chroma .kr { color: #66d9ef }

-/* KeywordType */ .chroma .kt { color: #66d9ef }

-/* NameAttribute */ .chroma .na { color: #a6e22e }

-/* NameClass */ .chroma .nc { color: #a6e22e }

-/* NameConstant */ .chroma .no { color: #66d9ef }

-/* NameDecorator */ .chroma .nd { color: #a6e22e }

-/* NameException */ .chroma .ne { color: #a6e22e }

-/* NameFunction */ .chroma .nf { color: #a6e22e }

-/* NameOther */ .chroma .nx { color: #a6e22e }

-/* NameTag */ .chroma .nt { color: #f92672 }

-/* Literal */ .chroma .l { color: #ae81ff }

-/* LiteralDate */ .chroma .ld { color: #e6db74 }

-/* LiteralString */ .chroma .s { color: #e6db74 }

-/* LiteralStringAffix */ .chroma .sa { color: #e6db74 }

-/* LiteralStringBacktick */ .chroma .sb { color: #e6db74 }

-/* LiteralStringChar */ .chroma .sc { color: #e6db74 }

-/* LiteralStringDelimiter */ .chroma .dl { color: #e6db74 }

-/* LiteralStringDoc */ .chroma .sd { color: #e6db74 }

-/* LiteralStringDouble */ .chroma .s2 { color: #e6db74 }

-/* LiteralStringEscape */ .chroma .se { color: #ae81ff }

-/* LiteralStringHeredoc */ .chroma .sh { color: #e6db74 }

-/* LiteralStringInterpol */ .chroma .si { color: #e6db74 }

-/* LiteralStringOther */ .chroma .sx { color: #e6db74 }

-/* LiteralStringRegex */ .chroma .sr { color: #e6db74 }

-/* LiteralStringSingle */ .chroma .s1 { color: #e6db74 }

-/* LiteralStringSymbol */ .chroma .ss { color: #e6db74 }

-/* LiteralNumber */ .chroma .m { color: #ae81ff }

-/* LiteralNumberBin */ .chroma .mb { color: #ae81ff }

-/* LiteralNumberFloat */ .chroma .mf { color: #ae81ff }

-/* LiteralNumberHex */ .chroma .mh { color: #ae81ff }

-/* LiteralNumberInteger */ .chroma .mi { color: #ae81ff }

-/* LiteralNumberIntegerLong */ .chroma .il { color: #ae81ff }

-/* LiteralNumberOct */ .chroma .mo { color: #ae81ff }

-/* Operator */ .chroma .o { color: #f92672 }

-/* OperatorWord */ .chroma .ow { color: #f92672 }

-/* Comment */ .chroma .c { color: #75715e }

-/* CommentHashbang */ .chroma .ch { color: #75715e }

-/* CommentMultiline */ .chroma .cm { color: #75715e }

-/* CommentSingle */ .chroma .c1 { color: #75715e }

-/* CommentSpecial */ .chroma .cs { color: #75715e }

-/* CommentPreproc */ .chroma .cp { color: #75715e }

-/* CommentPreprocFile */ .chroma .cpf { color: #75715e }

-/* GenericDeleted */ .chroma .gd { color: #f92672 }

-/* GenericEmph */ .chroma .ge { font-style: italic }

-/* GenericInserted */ .chroma .gi { color: #a6e22e }

-/* GenericStrong */ .chroma .gs { font-weight: bold }

-/* GenericSubheading */ .chroma .gu { color: #75715e }

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index ca01f9d..491bdbf 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -16,21 +16,13 @@
   {{ $style := resources.Get "css/style.css" }}
   {{ $markdown := resources.Get "css/markdown.css" }}
   {{ $syntaxHighlight := resources.Get "css/syntax-highlight.css" }}
-<<<<<<< HEAD
-  {{ $syntaxHighlightDark := resources.Get "css/syntax-highlight-dark.css" }}
-  {{ $css := slice $style $markdown $syntaxHighlight $syntaxHighlightDark | resources.Concat "style.css" | resources.Minify | resources.Fingerprint }}
+  {{ $css := slice $style $markdown $syntaxHighlight | resources.Concat "style.css" | resources.Minify | resources.Fingerprint }}
   <link rel="stylesheet" href="{{ $css.Permalink }}" integrity="{{ $css.Data.Integrity }}">
   {{ $styleDark := resources.Get "css/style-dark.css" }}
   {{ $markdownDark := resources.Get "css/markdown-dark.css" }}
-  {{ $syntaxHighlightDark := resources.Get "css/syntax-highlight-dark.css" }}
-  {{ $cssDark := slice $styleDark $markdownDark $syntaxHighlightDark | resources.Concat "style-dark.css" | resources.Minify | resources.Fingerprint }}
+  {{ $cssDark := slice $styleDark $markdownDark | resources.Concat "style-dark.css" | resources.Minify | resources.Fingerprint }}
   <link rel="stylesheet" href="{{ $cssDark.Permalink }}" media="(prefers-color-scheme: dark)" integrity="{{ $cssDark.Data.Integrity }}">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
-=======
-  {{ $css := slice $style $markdown $syntaxHighlight | resources.Concat "style.css" | resources.Minify | resources.Fingerprint }}
-  <link rel="stylesheet" href="{{ $css.Permalink }}" integrity="{{ $css.Data.Integrity }}">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.10.2/css/all.css" integrity="sha384-rtJEYb85SiYWgfpCr0jn174XgJTn4rptSOQsMroFBPQSGLdOC5IbubP6lJ35qoM9" crossorigin="anonymous">
->>>>>>> 6f679a10c35dcb01a59a197b112a60e446d8b628
 
   <!-- custom css -->
   {{ range .Site.Params.custom_css }}