From 13808612168f611f84c09c7b8a7c592f27419f1c Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Fri, 25 Dec 2020 13:49:48 +0100 Subject: [PATCH] Revert to css files instead of templates --- articles/static/authenticated.css | 8 ++++++ .../code_style.html => static/codehilite.css} | 2 -- .../snippets/style.html => static/newcss.css} | 27 ------------------- articles/static/public.css | 14 ++++++++++ articles/templates/articles/base.html | 6 +++-- .../articles/snippets/style_home.html | 23 ---------------- 6 files changed, 26 insertions(+), 54 deletions(-) create mode 100644 articles/static/authenticated.css rename articles/{templates/articles/snippets/code_style.html => static/codehilite.css} (99%) rename articles/{templates/articles/snippets/style.html => static/newcss.css} (91%) create mode 100644 articles/static/public.css delete mode 100644 articles/templates/articles/snippets/style_home.html diff --git a/articles/static/authenticated.css b/articles/static/authenticated.css new file mode 100644 index 0000000..3f24f61 --- /dev/null +++ b/articles/static/authenticated.css @@ -0,0 +1,8 @@ +.pill { + font-size: 60%; + background-color: var(--nc-tx-2); + color: var(--nc-bg-1); + padding: .5ex 1ex; + border-radius: 1ex; + vertical-align: 15%; +} diff --git a/articles/templates/articles/snippets/code_style.html b/articles/static/codehilite.css similarity index 99% rename from articles/templates/articles/snippets/code_style.html rename to articles/static/codehilite.css index 91bf8fe..40f2ea5 100644 --- a/articles/templates/articles/snippets/code_style.html +++ b/articles/static/codehilite.css @@ -1,4 +1,3 @@ - diff --git a/articles/templates/articles/snippets/style.html b/articles/static/newcss.css similarity index 91% rename from articles/templates/articles/snippets/style.html rename to articles/static/newcss.css index 4cff74e..77e9564 100644 --- a/articles/templates/articles/snippets/style.html +++ b/articles/static/newcss.css @@ -1,29 +1,2 @@ - - diff --git a/articles/static/public.css b/articles/static/public.css new file mode 100644 index 0000000..0e0f28a --- /dev/null +++ b/articles/static/public.css @@ -0,0 +1,14 @@ +body { + max-width: 640px; +} + +footer { + border-top: 2px solid var(--nc-bg-3); + margin-top: 2em; + font-size: 80%; + color: var(--nc-tx-2); +} + +footer > :first-child { + margin-top: 1em; +} diff --git a/articles/templates/articles/base.html b/articles/templates/articles/base.html index fddcc78..a4fc363 100644 --- a/articles/templates/articles/base.html +++ b/articles/templates/articles/base.html @@ -9,11 +9,13 @@ {% include "articles/snippets/page_metadata.html" %} {% block title %}Home | {% endblock %}{{ blog_title }} by {{ blog_author }} - {% include "articles/snippets/style.html" %} + + {% if article and article.has_code %} - {% include "articles/snippets/code_style.html" %} + {% endif %} {% if user.is_authenticated %} + {% endif %} {% include "articles/snippets/favicon.html" %} diff --git a/articles/templates/articles/snippets/style_home.html b/articles/templates/articles/snippets/style_home.html deleted file mode 100644 index 8885910..0000000 --- a/articles/templates/articles/snippets/style_home.html +++ /dev/null @@ -1,23 +0,0 @@ -