diff options
| author | Shea Polansky <shea@polansky.co> | 2020-03-23 07:37:32 +0300 |
|---|---|---|
| committer | Shea Polansky <shea@polansky.co> | 2020-03-23 07:37:32 +0300 |
| commit | 45afc8f82fd7661bc556577597e42ecafe976c05 (patch) | |
| tree | e10398ff323f765c46f98780afcd5b9fc1f32f2a | |
| parent | acfc578801a6fb9de10dc0df19f48f1ab6a21afd (diff) | |
| parent | 6f679a10c35dcb01a59a197b112a60e446d8b628 (diff) | |
Merge branch 'master' of https://github.com/koirand/pulp into auto-dark-theme
| -rw-r--r-- | layouts/_default/single.html | 3 | ||||
| -rw-r--r-- | layouts/partials/head.html | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index d05c8e2..4d1688f 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -5,6 +5,7 @@ {{ $singlePageDateFormat := .Site.Params.singlePageDateFormat | default "January 2, 2006"}} <p class="date">{{ .Date.Format $singlePageDateFormat }}</p> <!-- tags --> + {{ if .Param "tags" }} <div id="tags"> <ul> {{ range .Param "tags" }} @@ -15,6 +16,8 @@ {{ end }} </ul> </div> + {{ end }} + <h1>{{ .Title }}</h1> <!-- content --> <div id="contentBody"> {{ .Content }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index e2dd40c..ca01f9d 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -16,6 +16,7 @@ {{ $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 }} <link rel="stylesheet" href="{{ $css.Permalink }}" integrity="{{ $css.Data.Integrity }}"> @@ -25,6 +26,11 @@ {{ $cssDark := slice $styleDark $markdownDark $syntaxHighlightDark | 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 }} |