brozek/website-theme
1
0
Fork 0
mirror of https://github.com/Brandon-Rozek/website-theme.git synced 2024-11-21 15:56:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/koirand/pulp into auto-dark-theme

Browse source
This commit is contained in:
Shea Polansky 2020-03-22 21:37:32 -07:00
commit 45afc8f82f
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
layouts/_default/single.html
View file

@ -5,6 +5,7 @@
{{ $singlePageDateFormat := .Site.Params.singlePageDateFormat | default "January 2, 2006"}} {{ $singlePageDateFormat := .Site.Params.singlePageDateFormat | default "January 2, 2006"}}
<p class="date">{{ .Date.Format $singlePageDateFormat }}</p> <p class="date">{{ .Date.Format $singlePageDateFormat }}</p>
<!-- tags --> <!-- tags -->
{{ if .Param "tags" }}
<div id="tags"> <div id="tags">
<ul> <ul>
{{ range .Param "tags" }} {{ range .Param "tags" }}
@ -15,6 +16,8 @@
{{ end }} {{ end }}
</ul> </ul>
</div> </div>
{{ end }}
<h1>{{ .Title }}</h1>
<!-- content --> <!-- content -->
<div id="contentBody"> <div id="contentBody">
{{ .Content }} {{ .Content }}

6
layouts/partials/head.html
View file

@ -16,6 +16,7 @@
{{ $style := resources.Get "css/style.css" }} {{ $style := resources.Get "css/style.css" }}
{{ $markdown := resources.Get "css/markdown.css" }} {{ $markdown := resources.Get "css/markdown.css" }}
{{ $syntaxHighlight := resources.Get "css/syntax-highlight.css" }} {{ $syntaxHighlight := resources.Get "css/syntax-highlight.css" }}
<<<<<<< HEAD
{{ $syntaxHighlightDark := resources.Get "css/syntax-highlight-dark.css" }} {{ $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 $syntaxHighlightDark | resources.Concat "style.css" | resources.Minify | resources.Fingerprint }}
<link rel="stylesheet" href="{{ $css.Permalink }}" integrity="{{ $css.Data.Integrity }}"> <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 }} {{ $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="{{ $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"> <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 --> <!-- custom css -->
{{ range .Site.Params.custom_css }} {{ range .Site.Params.custom_css }}