aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortdro <tdro@noreply.example.com>2023-02-20 20:50:15 -0500
committertdro <tdro@noreply.example.com>2023-02-20 20:50:15 -0500
commit4b126a3c66c756806fa81713a210524629a72378 (patch)
treeb084ddb9b19a33ffd4405a89fde33bb8266c7e42
parente38f4489f8b080c32f634d3d99113a6c65984b64 (diff)
downloadcanory-4b126a3c66c756806fa81713a210524629a72378.tar.gz
canory-4b126a3c66c756806fa81713a210524629a72378.tar.bz2
canory-4b126a3c66c756806fa81713a210524629a72378.zip
themes/default/layouts/partials/bass: Set consistent asset entry point
-rw-r--r--themes/default/layouts/_default/home.xslt.rss.xsl8
-rw-r--r--themes/default/layouts/_default/home.xslt.sitemap.xsl10
-rw-r--r--themes/default/layouts/partials/base-css.html16
-rw-r--r--themes/default/layouts/partials/base-head.html18
-rw-r--r--themes/default/layouts/partials/base-js.html8
5 files changed, 31 insertions, 29 deletions
diff --git a/themes/default/layouts/_default/home.xslt.rss.xsl b/themes/default/layouts/_default/home.xslt.rss.xsl
index e0be815..a19642d 100644
--- a/themes/default/layouts/_default/home.xslt.rss.xsl
+++ b/themes/default/layouts/_default/home.xslt.rss.xsl
@@ -13,13 +13,7 @@
{{ printf `<title><xsl:value-of select="/rss/channel/title"/> Web Feed</title>` | safeHTML }}
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
- {{- $default := resources.Get "css/default.css" -}}
- {{- if .Site.Params.site.production -}}
- {{ $css := slice $default | resources.Concat "css/bundle.css" | resources.Minify | fingerprint }}
- <link rel="stylesheet" type="text/css" href="{{ $css.Permalink }}"/>
- {{- else }}
- <link rel="stylesheet" type="text/css" href="{{ $default.Permalink }}"/>
- {{- end }}
+ {{- partial "base-css.html" . -}}
</head>
<body>
<column-left>
diff --git a/themes/default/layouts/_default/home.xslt.sitemap.xsl b/themes/default/layouts/_default/home.xslt.sitemap.xsl
index 167b773..0edfec5 100644
--- a/themes/default/layouts/_default/home.xslt.sitemap.xsl
+++ b/themes/default/layouts/_default/home.xslt.sitemap.xsl
@@ -11,13 +11,7 @@
<title>{{ $.Site.Title }} Site Map</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
- {{- $default := resources.Get "css/default.css" -}}
- {{- if .Site.Params.site.production -}}
- {{ $css := slice $default | resources.Concat "css/bundle.css" | resources.Minify | fingerprint }}
- <link rel="stylesheet" type="text/css" href="{{ $css.Permalink }}"/>
- {{- else }}
- <link rel="stylesheet" type="text/css" href="{{ $default.Permalink }}"/>
- {{- end }}
+ {{- partial "base-css.html" . -}}
</head>
<body>
<column-left>
@@ -58,7 +52,7 @@
<table>
<thead>
<tr>
- <th>
+ <th align="left">
<code>
<xsl:value-of select="count(sitemap:urlset/sitemap:url)"/>
Uniform Resource Locators (URLs)
diff --git a/themes/default/layouts/partials/base-css.html b/themes/default/layouts/partials/base-css.html
new file mode 100644
index 0000000..0a104c3
--- /dev/null
+++ b/themes/default/layouts/partials/base-css.html
@@ -0,0 +1,16 @@
+{{- $default := resources.Get "css/default.css" -}}
+{{- $syntax := resources.Get "css/syntax-highlight-default.css" -}}
+
+{{- $css :=
+ slice $default $syntax |
+ resources.Concat "css/bundle.css" |
+ resources.Minify |
+ fingerprint |
+-}}
+
+{{ if .Site.Params.site.production }}
+<link title ="Default" rel="stylesheet" href="{{ $css.Permalink }}" />
+{{ else }}
+<link title="Default" rel="stylesheet" href="{{ $default.Permalink }}" />
+<link rel="stylesheet" href="{{ $syntax.Permalink }}" />
+{{ end }}
diff --git a/themes/default/layouts/partials/base-head.html b/themes/default/layouts/partials/base-head.html
index 53d1fbc..3d220ba 100644
--- a/themes/default/layouts/partials/base-head.html
+++ b/themes/default/layouts/partials/base-head.html
@@ -56,21 +56,11 @@
<!-- Canonicalization -->
{{- partial "base-canonical.html" . -}}
-<!-- Style Sheets & Scripts -->
-{{- $index := resources.Get "js/index.js" -}}
-{{- $default := resources.Get "css/default.css" -}}
-{{- $syntax := resources.Get "css/syntax-highlight-default.css" -}}
-{{- $js := $index | resources.Minify | fingerprint -}}
-{{- $css := slice $default $syntax | resources.Concat "css/bundle.css" | resources.Minify | fingerprint -}}
+<!-- Styles -->
+{{- partial "base-css.html" . -}}
-{{ if .Site.Params.site.production }}
-<link title ="Default" rel="stylesheet" href="{{ $css.Permalink }}" />
-<script src="{{ $js.Permalink }}"></script>
-{{ else }}
-<link title="Default" rel="stylesheet" href="{{ $default.Permalink }}" />
-<link rel="stylesheet" href="{{ $syntax.Permalink }}" />
-<script src="{{ $index.Permalink }}"></script>
-{{ end }}
+<!-- Scripts -->
+{{- partial "base-js.html" . -}}
<!-- Progressive Enhancement -->
{{- partial "base-manifest.html" . -}}
diff --git a/themes/default/layouts/partials/base-js.html b/themes/default/layouts/partials/base-js.html
new file mode 100644
index 0000000..a491eee
--- /dev/null
+++ b/themes/default/layouts/partials/base-js.html
@@ -0,0 +1,8 @@
+{{- $index := resources.Get "js/index.js" -}}
+{{- $js := $index | resources.Minify | fingerprint -}}
+
+{{ if .Site.Params.site.production }}
+<script src="{{ $js.Permalink }}"></script>
+{{ else }}
+<script src="{{ $index.Permalink }}"></script>
+{{ end }}