From 661d4365404a3e7d767c967879f1891e3078886b Mon Sep 17 00:00:00 2001 From: Shea Polansky Date: Sun, 22 Mar 2020 13:09:31 -0700 Subject: [PATCH 1/5] Add auto dark theme --- assets/css/markdown-dark.css | 89 ++++++++++++++++++++++++++++ assets/css/style-dark.css | 48 +++++++++++++++ assets/css/syntax-highlight-dark.css | 65 ++++++++++++++++++++ layouts/partials/head.html | 10 +++- 4 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 assets/css/markdown-dark.css create mode 100644 assets/css/style-dark.css create mode 100644 assets/css/syntax-highlight-dark.css diff --git a/assets/css/markdown-dark.css b/assets/css/markdown-dark.css new file mode 100644 index 0000000..10c78d7 --- /dev/null +++ b/assets/css/markdown-dark.css @@ -0,0 +1,89 @@ +#contentBody img { + box-shadow: 0px 3px 15px rgba(255,255,255,0.2); +} + +#contentBody hr { + border-bottom: 1px solid #201d1a; +} + +#contentBody hr { + background-color: #1e1b17; +} + +#contentBody blockquote { + color: #958c82; + border-left: 0.25em solid #201d1a; +} + +#contentBody kbd { + color: #bbb2a9; + background-color: #050403; + border: solid 1px #39342e; + border-bottom-color: #6a625a; + box-shadow: inset 0 -1px 0 #6a625a; +} + +#contentBody h1 .octicon-link, +#contentBody h2 .octicon-link, +#contentBody h3 .octicon-link, +#contentBody h4 .octicon-link, +#contentBody h5 .octicon-link, +#contentBody h6 .octicon-link { + color: #e4e0dc; +} + +#contentBody h1 { + border-bottom: 1px solid #363636; +} + +#contentBody h2 { + border-bottom: 1px solid #363636; +} + + +#contentBody h6 { + font-size: 0.85em; + color: #958c82; +} + +#contentBody table th, +#contentBody table td { + padding: 6px 13px; + border: 1px solid #363636; + background-color: #090909; +} + +#contentBody img { + background-color: #090909; +} + + +#contentBody code { + background-color: #090909; +} + +#contentBody .highlight pre, +#contentBody pre { + background-color: #090909; +} + +#contentBody .full-commit .btn-outline:not(:disabled):hover { + color: #005cc5; + border-color: #005cc5; +} + +#contentBody kbd { + color: #bbb2a9; + background-color: #050403; + border: solid 1px #2e2a25; + border-bottom-color: #39342e; + box-shadow: inset 0 -1px 0 #c6cbd1; +} + +#contentBody :checked+.radio-label { + border-color: #0366d6; +} + +#contentBody hr { + border-bottom-color: #111; +} diff --git a/assets/css/style-dark.css b/assets/css/style-dark.css new file mode 100644 index 0000000..8502818 --- /dev/null +++ b/assets/css/style-dark.css @@ -0,0 +1,48 @@ +/* General */ +body { + background-color: #101010; + color: #8f8f8f; +} + +a:link { + color: #8f8f8f; +} + +a:visited { + color: #8f8f8f; +} + +a:hover { + color: #8f8f8f; +} + +a:active { + color: #8f8f8f; +} + +#searchBox #searchBoxInput { + color: #8f8f8f; + background-color:#363636; + border: solid 1px #363636; +} + +#searchBox #searchBoxInput::placeholder { + color: #363636; +} + +#searchResults { + background-color:#363636; + border: solid 1px #363636; +} + +#searchResults mark { + background-color: #222020; +} + +#tags li a { + background-color: #222020; +} + +#contentsList hr.separator { + border: solid 1px #363636; +} diff --git a/assets/css/syntax-highlight-dark.css b/assets/css/syntax-highlight-dark.css new file mode 100644 index 0000000..4c8afdf --- /dev/null +++ b/assets/css/syntax-highlight-dark.css @@ -0,0 +1,65 @@ +/* Background */ .chroma { color: #d0d0d0; background-color: #202020 } +/* Error */ .chroma .err { color: #a61717; background-color: #e3d2d2 } +/* 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: #686868 } +/* LineNumbers */ .chroma .ln { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #686868 } +/* Keyword */ .chroma .k { color: #6ab825; font-weight: bold } +/* KeywordConstant */ .chroma .kc { color: #6ab825; font-weight: bold } +/* KeywordDeclaration */ .chroma .kd { color: #6ab825; font-weight: bold } +/* KeywordNamespace */ .chroma .kn { color: #6ab825; font-weight: bold } +/* KeywordPseudo */ .chroma .kp { color: #6ab825 } +/* KeywordReserved */ .chroma .kr { color: #6ab825; font-weight: bold } +/* KeywordType */ .chroma .kt { color: #6ab825; font-weight: bold } +/* NameAttribute */ .chroma .na { color: #bbbbbb } +/* NameBuiltin */ .chroma .nb { color: #24909d } +/* NameClass */ .chroma .nc { color: #447fcf; text-decoration: underline } +/* NameConstant */ .chroma .no { color: #40ffff } +/* NameDecorator */ .chroma .nd { color: #ffa500 } +/* NameException */ .chroma .ne { color: #bbbbbb } +/* NameFunction */ .chroma .nf { color: #447fcf } +/* NameNamespace */ .chroma .nn { color: #447fcf; text-decoration: underline } +/* NameTag */ .chroma .nt { color: #6ab825; font-weight: bold } +/* NameVariable */ .chroma .nv { color: #40ffff } +/* LiteralString */ .chroma .s { color: #ed9d13 } +/* LiteralStringAffix */ .chroma .sa { color: #ed9d13 } +/* LiteralStringBacktick */ .chroma .sb { color: #ed9d13 } +/* LiteralStringChar */ .chroma .sc { color: #ed9d13 } +/* LiteralStringDelimiter */ .chroma .dl { color: #ed9d13 } +/* LiteralStringDoc */ .chroma .sd { color: #ed9d13 } +/* LiteralStringDouble */ .chroma .s2 { color: #ed9d13 } +/* LiteralStringEscape */ .chroma .se { color: #ed9d13 } +/* LiteralStringHeredoc */ .chroma .sh { color: #ed9d13 } +/* LiteralStringInterpol */ .chroma .si { color: #ed9d13 } +/* LiteralStringOther */ .chroma .sx { color: #ffa500 } +/* LiteralStringRegex */ .chroma .sr { color: #ed9d13 } +/* LiteralStringSingle */ .chroma .s1 { color: #ed9d13 } +/* LiteralStringSymbol */ .chroma .ss { color: #ed9d13 } +/* LiteralNumber */ .chroma .m { color: #3677a9 } +/* LiteralNumberBin */ .chroma .mb { color: #3677a9 } +/* LiteralNumberFloat */ .chroma .mf { color: #3677a9 } +/* LiteralNumberHex */ .chroma .mh { color: #3677a9 } +/* LiteralNumberInteger */ .chroma .mi { color: #3677a9 } +/* LiteralNumberIntegerLong */ .chroma .il { color: #3677a9 } +/* LiteralNumberOct */ .chroma .mo { color: #3677a9 } +/* OperatorWord */ .chroma .ow { color: #6ab825; font-weight: bold } +/* Comment */ .chroma .c { color: #999999; font-style: italic } +/* CommentHashbang */ .chroma .ch { color: #999999; font-style: italic } +/* CommentMultiline */ .chroma .cm { color: #999999; font-style: italic } +/* CommentSingle */ .chroma .c1 { color: #999999; font-style: italic } +/* CommentSpecial */ .chroma .cs { color: #e50808; background-color: #520000; font-weight: bold } +/* CommentPreproc */ .chroma .cp { color: #cd2828; font-weight: bold } +/* CommentPreprocFile */ .chroma .cpf { color: #cd2828; font-weight: bold } +/* GenericDeleted */ .chroma .gd { color: #d22323 } +/* GenericEmph */ .chroma .ge { font-style: italic } +/* GenericError */ .chroma .gr { color: #d22323 } +/* GenericHeading */ .chroma .gh { color: #ffffff; font-weight: bold } +/* GenericInserted */ .chroma .gi { color: #589819 } +/* GenericOutput */ .chroma .go { color: #cccccc } +/* GenericPrompt */ .chroma .gp { color: #aaaaaa } +/* GenericStrong */ .chroma .gs { font-weight: bold } +/* GenericSubheading */ .chroma .gu { color: #ffffff; text-decoration: underline } +/* GenericTraceback */ .chroma .gt { color: #d22323 } +/* GenericUnderline */ .chroma .gl { text-decoration: underline } +/* TextWhitespace */ .chroma .w { color: #666666 } \ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html index b4c383d..e2dd40c 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -16,8 +16,14 @@ {{ $style := resources.Get "css/style.css" }} {{ $markdown := resources.Get "css/markdown.css" }} {{ $syntaxHighlight := resources.Get "css/syntax-highlight.css" }} - {{ $css := slice $style $markdown $syntaxHighlight | resources.Concat "style.css" | resources.Minify | resources.Fingerprint }} - + {{ $syntaxHighlightDark := resources.Get "css/syntax-highlight-dark.css" }} + {{ $css := slice $style $markdown $syntaxHighlight $syntaxHighlightDark | resources.Concat "style.css" | resources.Minify | resources.Fingerprint }} + + {{ $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 }} + From 508b13f5634a8a9c1e4fef084d135fb2afb5338f Mon Sep 17 00:00:00 2001 From: Shea Polansky Date: Sun, 22 Mar 2020 13:18:14 -0700 Subject: [PATCH 2/5] Swap dark code css to monokai --- assets/css/syntax-highlight-dark.css | 114 +++++++++++++-------------- 1 file changed, 54 insertions(+), 60 deletions(-) diff --git a/assets/css/syntax-highlight-dark.css b/assets/css/syntax-highlight-dark.css index 4c8afdf..b581d2f 100644 --- a/assets/css/syntax-highlight-dark.css +++ b/assets/css/syntax-highlight-dark.css @@ -1,65 +1,59 @@ -/* Background */ .chroma { color: #d0d0d0; background-color: #202020 } -/* Error */ .chroma .err { color: #a61717; background-color: #e3d2d2 } +/* 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: #686868 } -/* LineNumbers */ .chroma .ln { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #686868 } -/* Keyword */ .chroma .k { color: #6ab825; font-weight: bold } -/* KeywordConstant */ .chroma .kc { color: #6ab825; font-weight: bold } -/* KeywordDeclaration */ .chroma .kd { color: #6ab825; font-weight: bold } -/* KeywordNamespace */ .chroma .kn { color: #6ab825; font-weight: bold } -/* KeywordPseudo */ .chroma .kp { color: #6ab825 } -/* KeywordReserved */ .chroma .kr { color: #6ab825; font-weight: bold } -/* KeywordType */ .chroma .kt { color: #6ab825; font-weight: bold } -/* NameAttribute */ .chroma .na { color: #bbbbbb } -/* NameBuiltin */ .chroma .nb { color: #24909d } -/* NameClass */ .chroma .nc { color: #447fcf; text-decoration: underline } -/* NameConstant */ .chroma .no { color: #40ffff } -/* NameDecorator */ .chroma .nd { color: #ffa500 } -/* NameException */ .chroma .ne { color: #bbbbbb } -/* NameFunction */ .chroma .nf { color: #447fcf } -/* NameNamespace */ .chroma .nn { color: #447fcf; text-decoration: underline } -/* NameTag */ .chroma .nt { color: #6ab825; font-weight: bold } -/* NameVariable */ .chroma .nv { color: #40ffff } -/* LiteralString */ .chroma .s { color: #ed9d13 } -/* LiteralStringAffix */ .chroma .sa { color: #ed9d13 } -/* LiteralStringBacktick */ .chroma .sb { color: #ed9d13 } -/* LiteralStringChar */ .chroma .sc { color: #ed9d13 } -/* LiteralStringDelimiter */ .chroma .dl { color: #ed9d13 } -/* LiteralStringDoc */ .chroma .sd { color: #ed9d13 } -/* LiteralStringDouble */ .chroma .s2 { color: #ed9d13 } -/* LiteralStringEscape */ .chroma .se { color: #ed9d13 } -/* LiteralStringHeredoc */ .chroma .sh { color: #ed9d13 } -/* LiteralStringInterpol */ .chroma .si { color: #ed9d13 } -/* LiteralStringOther */ .chroma .sx { color: #ffa500 } -/* LiteralStringRegex */ .chroma .sr { color: #ed9d13 } -/* LiteralStringSingle */ .chroma .s1 { color: #ed9d13 } -/* LiteralStringSymbol */ .chroma .ss { color: #ed9d13 } -/* LiteralNumber */ .chroma .m { color: #3677a9 } -/* LiteralNumberBin */ .chroma .mb { color: #3677a9 } -/* LiteralNumberFloat */ .chroma .mf { color: #3677a9 } -/* LiteralNumberHex */ .chroma .mh { color: #3677a9 } -/* LiteralNumberInteger */ .chroma .mi { color: #3677a9 } -/* LiteralNumberIntegerLong */ .chroma .il { color: #3677a9 } -/* LiteralNumberOct */ .chroma .mo { color: #3677a9 } -/* OperatorWord */ .chroma .ow { color: #6ab825; font-weight: bold } -/* Comment */ .chroma .c { color: #999999; font-style: italic } -/* CommentHashbang */ .chroma .ch { color: #999999; font-style: italic } -/* CommentMultiline */ .chroma .cm { color: #999999; font-style: italic } -/* CommentSingle */ .chroma .c1 { color: #999999; font-style: italic } -/* CommentSpecial */ .chroma .cs { color: #e50808; background-color: #520000; font-weight: bold } -/* CommentPreproc */ .chroma .cp { color: #cd2828; font-weight: bold } -/* CommentPreprocFile */ .chroma .cpf { color: #cd2828; font-weight: bold } -/* GenericDeleted */ .chroma .gd { color: #d22323 } +/* 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 } -/* GenericError */ .chroma .gr { color: #d22323 } -/* GenericHeading */ .chroma .gh { color: #ffffff; font-weight: bold } -/* GenericInserted */ .chroma .gi { color: #589819 } -/* GenericOutput */ .chroma .go { color: #cccccc } -/* GenericPrompt */ .chroma .gp { color: #aaaaaa } +/* GenericInserted */ .chroma .gi { color: #a6e22e } /* GenericStrong */ .chroma .gs { font-weight: bold } -/* GenericSubheading */ .chroma .gu { color: #ffffff; text-decoration: underline } -/* GenericTraceback */ .chroma .gt { color: #d22323 } -/* GenericUnderline */ .chroma .gl { text-decoration: underline } -/* TextWhitespace */ .chroma .w { color: #666666 } \ No newline at end of file +/* GenericSubheading */ .chroma .gu { color: #75715e } From acfc578801a6fb9de10dc0df19f48f1ab6a21afd Mon Sep 17 00:00:00 2001 From: Shea Polansky Date: Sun, 22 Mar 2020 13:49:18 -0700 Subject: [PATCH 3/5] Invert avatar border in dark mode --- assets/css/style-dark.css | 4 ++++ layouts/index.html | 2 +- layouts/partials/header.html | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/css/style-dark.css b/assets/css/style-dark.css index 8502818..685e021 100644 --- a/assets/css/style-dark.css +++ b/assets/css/style-dark.css @@ -46,3 +46,7 @@ a:active { #contentsList hr.separator { border: solid 1px #363636; } + +img.avatar-border { + filter: invert(100%); +} \ No newline at end of file diff --git a/layouts/index.html b/layouts/index.html index 1bc104a..9956da5 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -8,7 +8,7 @@
avatar - avatar-border + avatar-border

{{ .Site.Params.Author }}

diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 9c1d7e7..cf8a7ba 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -2,7 +2,7 @@
- +

{{ .Site.Params.Author }}

From 10118afb776a978fd97be61de4b03c98cbffca9d Mon Sep 17 00:00:00 2001 From: Shea Polansky Date: Sun, 22 Mar 2020 21:32:58 -0700 Subject: [PATCH 4/5] Remove syntax-highlight-dark.css, it wasn't necessary --- assets/css/syntax-highlight-dark.css | 59 ---------------------------- layouts/partials/head.html | 12 +----- 2 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 assets/css/syntax-highlight-dark.css 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 }} {{ $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 }} -======= - {{ $css := slice $style $markdown $syntaxHighlight | resources.Concat "style.css" | resources.Minify | resources.Fingerprint }} - - ->>>>>>> 6f679a10c35dcb01a59a197b112a60e446d8b628 {{ range .Site.Params.custom_css }} From 898362e9ae9fdf715205f3786c892a201f003244 Mon Sep 17 00:00:00 2001 From: Shea Polansky Date: Sun, 22 Mar 2020 13:17:56 -0700 Subject: [PATCH 5/5] Remove border-radius from highlighted objects --- assets/css/markdown.css | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/css/markdown.css b/assets/css/markdown.css index f533d29..d55bc25 100644 --- a/assets/css/markdown.css +++ b/assets/css/markdown.css @@ -485,7 +485,6 @@ font-size: 85%; line-height: 1.45; background-color: #f6f6f6; - border-radius: 3px; } #contentBody pre code {