From a961bc284bb130e44468c07aaaa028652c151e08 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 9 Sep 2023 19:21:12 +0200 Subject: Squashed 'themes/bear/' changes from fe37fcf..d10630d d10630d Hash inline style in CSP f51202d Allow end-user to disable CSP header meta tags without editing theme 093ac10 Add form-action and base-uri CSPs 4c9ac0a Update base_url eed984f Merge dark/light screenshots into one 099acbd Add "deploy to netlify" button 0800ba2 Update demo URL 9a344d8 Add meta description 241f290 Remove ignored CSP content 53d198f Move demo site to netlify 3423985 Add netlify status badge to readme edfec31 Configure headers for netlify a1bcb91 Add netlify.toml d69e95a Add content-security-policy header-equivalent meta tag 1706ade Linkify demo URL 141c10c Merge pull request 'Update 'theme.toml'' (#1) from jakeg/zola-bearblog:main into main 6b275f6 Update 'theme.toml' REVERT: fe37fcf Merge branch 'main' into microformats2 REVERT: 40881d1 Merge branch 'main' into microformats2 REVERT: 2ca8f6c Merge branch 'main' into microformats2 REVERT: dad7895 Merge branch 'main' into microformats2 REVERT: cdd1069 Move header/footer/main elements into child templates git-subtree-dir: themes/bear git-subtree-split: d10630da50a2b0e005ef0499190cc5cc898f0b06 --- templates/base.html | 7 +- templates/security_tags.html | 2 + templates/seo_tags.html | 1 + templates/style.css.html | 169 ++++++++++++++++++++++++++++++++++++++++++ templates/style.html | 172 ------------------------------------------- 5 files changed, 178 insertions(+), 173 deletions(-) create mode 100644 templates/security_tags.html create mode 100644 templates/style.css.html delete mode 100644 templates/style.html (limited to 'templates') diff --git a/templates/base.html b/templates/base.html index 4ba8442..ee206b3 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,6 +1,9 @@ + {%- if config.webserver_sends_csp_headers %} + {%- include "security_tags.html" ignore missing %} + {%- endif %} {% include "favicon.html" ignore missing -%} @@ -12,7 +15,9 @@ {%- endblock -%} {%- endif %} - {% include "style.html" ignore missing -%} + {% include "custom_head.html" ignore missing -%} diff --git a/templates/security_tags.html b/templates/security_tags.html new file mode 100644 index 0000000..0f922ea --- /dev/null +++ b/templates/security_tags.html @@ -0,0 +1,2 @@ + + diff --git a/templates/seo_tags.html b/templates/seo_tags.html index 797569a..4eb2bc8 100644 --- a/templates/seo_tags.html +++ b/templates/seo_tags.html @@ -1 +1,2 @@ + diff --git a/templates/style.css.html b/templates/style.css.html new file mode 100644 index 0000000..00b4131 --- /dev/null +++ b/templates/style.css.html @@ -0,0 +1,169 @@ + body { + font-family: Verdana, sans-serif; + margin: auto; + padding: 20px; + max-width: 720px; + text-align: left; + background-color: #fff; + word-wrap: break-word; + overflow-wrap: break-word; + line-height: 1.5; + color: #444; + } + + h1, + h2, + h3, + h4, + h5, + h6, + strong, + b { + color: #222; + } + + a { + color: #3273dc; + } + + .title { + text-decoration: none; + border: 0; + } + + .title span { + font-weight: 400; + } + + nav a { + margin-right: 10px; + } + + textarea { + width: 100%; + font-size: 1rem; + } + + input { + font-size: 1rem; + } + + main,article { + line-height: 1.6; + } + + table { + width: 100%; + } + + img { + max-width: 100%; + } + + code { + padding: 2px 5px; + background-color: #f2f2f2; + } + + pre code { + color: #222; + display: block; + padding: 20px; + white-space: pre-wrap; + font-size: 0.875rem; + overflow-x: auto; + } + + div.highlight pre { + background-color: initial; + color: initial; + } + + div.highlight code { + background-color: unset; + color: unset; + } + + blockquote { + border-left: 1px solid #999; + color: #222; + padding-left: 20px; + font-style: italic; + } + + footer { + padding: 25px; + text-align: center; + } + + .helptext { + color: #777; + font-size: small; + } + + .errorlist { + color: #eba613; + font-size: small; + } + + /* blog posts */ + ul.blog-posts { + list-style-type: none; + padding: unset; + } + + ul.blog-posts li { + display: flex; + } + + ul.blog-posts li span { + flex: 0 0 130px; + } + + ul.blog-posts li a:visited { + color: #8b6fcb; + } + + @media (prefers-color-scheme: dark) { + body { + background-color: #333; + color: #ddd; + } + + h1, + h2, + h3, + h4, + h5, + h6, + strong, + b { + color: #eee; + } + + a { + color: #8cc2dd; + } + + code { + background-color: #777; + } + + pre code { + color: #ddd; + } + + blockquote { + color: #ccc; + } + + textarea, + input { + background-color: #252525; + color: #ddd; + } + + .helptext { + color: #aaa; + } + } diff --git a/templates/style.html b/templates/style.html deleted file mode 100644 index 4744695..0000000 --- a/templates/style.html +++ /dev/null @@ -1,172 +0,0 @@ - -- cgit 1.4.1