From 34ebf5a6dc1bf32707026a8aae01fef94caba04c Mon Sep 17 00:00:00 2001 From: David Lapshin Date: Mon, 29 Apr 2024 17:05:11 +0300 Subject: [PATCH] Add drfated and archived badges in blog list, use archive icon for archived statement, remove ellipsis form load comments button --- content/blog/drafted-post/index.md | 17 ++++++++++ content/blog/ipsum/index.md | 2 +- content/blog/lorem/index.md | 2 +- content/blog/the-quill-of-duck/index.md | 3 +- sass/_blog-list.scss | 41 +++++++++++++++++++++++++ sass/_main.scss | 4 --- sass/style.scss | 1 + templates/blog.html | 2 +- templates/blog_list.html | 14 ++++++++- templates/page.html | 5 ++- templates/partials/comments.html | 2 +- 11 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 content/blog/drafted-post/index.md create mode 100644 sass/_blog-list.scss diff --git a/content/blog/drafted-post/index.md b/content/blog/drafted-post/index.md new file mode 100644 index 0000000..b3ffcec --- /dev/null +++ b/content/blog/drafted-post/index.md @@ -0,0 +1,17 @@ ++++ +authors = ["John Draft"] +title = "Drafty draft" +description = "Drafted post, very drafty." +date = 2024-04-29 +draft = true +[taxonomies] +tags = ["Draft"] +[extra] +toc = false ++++ + +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim aeque doleamus animo, cum corpore dolemus, fieri tamen permagna accessio potest, si aliquod aeternum et infinitum impendere malum nobis opinemur. Quod idem licet transferre in voluptatem, ut postea. + +Ullus investigandi veri, nisi inveneris, et quaerendi defatigatio turpis est, cum esset accusata et vituperata ab Hortensio. Qui liber cum et mortem contemnit, qua qui est imbutus quietus esse numquam potest. Praeterea bona praeterita grata recordatione renovata delectant. Est. + +Ullus investigandi veri, nisi inveneris, et quaerendi defatigatio turpis est, cum esset accusata et vituperata ab Hortensio. Qui liber cum et mortem contemnit, qua qui est imbutus quietus esse numquam potest. Praeterea. diff --git a/content/blog/ipsum/index.md b/content/blog/ipsum/index.md index dc48802..905bc43 100644 --- a/content/blog/ipsum/index.md +++ b/content/blog/ipsum/index.md @@ -13,4 +13,4 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i Ullus investigandi veri, nisi inveneris, et quaerendi defatigatio turpis est, cum esset accusata et vituperata ab Hortensio. Qui liber cum et mortem contemnit, qua qui est imbutus quietus esse numquam potest. Praeterea bona praeterita grata recordatione renovata delectant. Est. -Ullus investigandi veri, nisi inveneris, et quaerendi defatigatio turpis est, cum esset accusata et vituperata ab Hortensio. Qui liber cum et mortem contemnit, qua qui est imbutus quietus esse numquam potest. Praeterea. \ No newline at end of file +Ullus investigandi veri, nisi inveneris, et quaerendi defatigatio turpis est, cum esset accusata et vituperata ab Hortensio. Qui liber cum et mortem contemnit, qua qui est imbutus quietus esse numquam potest. Praeterea. diff --git a/content/blog/lorem/index.md b/content/blog/lorem/index.md index 9ac5e83..6dfca0a 100644 --- a/content/blog/lorem/index.md +++ b/content/blog/lorem/index.md @@ -13,4 +13,4 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i Ullus investigandi veri, nisi inveneris, et quaerendi defatigatio turpis est, cum esset accusata et vituperata ab Hortensio. Qui liber cum et mortem contemnit, qua qui est imbutus quietus esse numquam potest. Praeterea bona praeterita grata recordatione renovata delectant. Est. -Ullus investigandi veri, nisi inveneris, et quaerendi defatigatio turpis est, cum esset accusata et vituperata ab Hortensio. Qui liber cum et mortem contemnit, qua qui est imbutus quietus esse numquam potest. Praeterea. \ No newline at end of file +Ullus investigandi veri, nisi inveneris, et quaerendi defatigatio turpis est, cum esset accusata et vituperata ab Hortensio. Qui liber cum et mortem contemnit, qua qui est imbutus quietus esse numquam potest. Praeterea. diff --git a/content/blog/the-quill-of-duck/index.md b/content/blog/the-quill-of-duck/index.md index 215a78b..ff018fc 100644 --- a/content/blog/the-quill-of-duck/index.md +++ b/content/blog/the-quill-of-duck/index.md @@ -6,12 +6,11 @@ date = 2023-08-31 [taxonomies] tags = ["Demo", "Test"] [extra] +archive = "This page is, in fact, not archived." toc = true disclaimer = """ See [demo](@/demo/index.md) for showcase of all Duckquill possibilities, this page is a demo of a post with title, publication date, tags, disclaimer, table of contents and comments. """ -[extra.comments] -id = "" +++ ![Quill](quill.png) diff --git a/sass/_blog-list.scss b/sass/_blog-list.scss new file mode 100644 index 0000000..a1ad6b7 --- /dev/null +++ b/sass/_blog-list.scss @@ -0,0 +1,41 @@ +.blog-list { + article { + position: relative; + + &.draft { + outline: 2px dashed var(--fg-muted-2); + outline-offset: 0.5rem; + border-radius: 1rem; + } + + .draft-badge, + .archive-badge { + position: absolute; + top: 0; + right: 0; + transition: var(--transition); + box-shadow: var(--edge-highlight); + border-radius: 999px; + padding: 0.25rem 0.75rem; + font-weight: bold; + + svg { + vertical-align: -0.125em; + } + } + + .draft-badge { + background-color: var(--fg-muted-1); + color: var(--fg-muted-4); + } + + .archive-badge { + background-color: var(--purple-bg); + color: var(--purple-fg); + } + } + + hr:last-of-type { + display: none; + } +} diff --git a/sass/_main.scss b/sass/_main.scss index 048cbdb..5ff8cd8 100644 --- a/sass/_main.scss +++ b/sass/_main.scss @@ -140,10 +140,6 @@ hr { width: 100%; } -.blog-list hr:last-of-type { - display: none; -} - blockquote { margin: 0; border-left: 0.25rem solid var(--primary-color); diff --git a/sass/style.scss b/sass/style.scss index 27e1ca3..fa95a7d 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -9,6 +9,7 @@ @use "variables"; @use "main"; +@use "blog-list"; @use "buttons"; @use "comments"; @use "crt"; diff --git a/templates/blog.html b/templates/blog.html index b549677..a0248dc 100644 --- a/templates/blog.html +++ b/templates/blog.html @@ -30,7 +30,7 @@ {% if page.extra.archive %}
- + Archived {{ page.extra.archive | markdown | safe }} diff --git a/templates/blog_list.html b/templates/blog_list.html index b836a0b..7d4c099 100644 --- a/templates/blog_list.html +++ b/templates/blog_list.html @@ -13,8 +13,20 @@
{% for page in section.pages %} -
+

{{ page.title }}

+ {%- if page.draft %} + + + Drafted + + {%- endif %} + {%- if page.extra.archive %} + + + Archived + + {%- endif %} {%- if page.description %}

{{ page.description }}

{%- endif %} diff --git a/templates/page.html b/templates/page.html index c46c4de..fb325f2 100644 --- a/templates/page.html +++ b/templates/page.html @@ -3,7 +3,10 @@ {% block content %} {% if page.extra.archive %}
- Archived + + + Archived + {{ page.extra.archive | markdown | safe }}
{% endif %} diff --git a/templates/partials/comments.html b/templates/partials/comments.html index cab34a5..a33b886 100644 --- a/templates/partials/comments.html +++ b/templates/partials/comments.html @@ -25,7 +25,7 @@

- Load Comments… + Load Comments