themes/default/layouts/partials/function-content: Make block quotes easier to write

Remove footer since it's no longer needed

5 files changed, 40 insertions, 19 deletions

diff --git a/assets/css/default.css b/assets/css/default.css
index 6f1e10c..3561d30 100644
--- a/assets/css/default.css
+++ b/assets/css/default.css
@@ -290,15 +290,20 @@ input[type="checkbox"]:checked:after {
 }
 
 blockquote {
-  padding-left: 2rem;
+  color: #444;
+  color: var(--fade);
 }
 
-blockquote p span {
-  display: block;
+blockquote p {
+  padding-left: 1rem;
+  margin-left: 1rem;
+  border-left: 2px solid;
+  border-color: #eee;
+  border-color: var(--border-lighter);
+}
+
+blockquote footer  {
   text-align: right;
-  font-style: normal;
-  font-size: 80%;
-  margin-top: 0.75rem;
 }
 
 video {
@@ -356,7 +361,7 @@ blockquote span {
 
 blockquote p {
   font-family: Charter, Georgia, "Book Antiqua", serif;
-  font-size: 125%;
+  font-size: 110%;
 }
 
 pre,
@@ -956,7 +961,7 @@ micro-content ul li + li {
 }
 
 micro-content ul li:before {
-  content: "\2014";
+  content: "\2012";
   padding: 0 0.5rem 0 1.25rem;
 }
 
diff --git a/content/canory/messages/diagrams.md b/content/canory/messages/diagrams.md
index d3a2521..9d99549 100644
--- a/content/canory/messages/diagrams.md
+++ b/content/canory/messages/diagrams.md
@@ -12,11 +12,15 @@ probably like them :sweat_smile:. I'm over the character limit but look mommy
 
 [**GoAT Diagram**](https://github.com/blampe/goat#goat-go-ascii-tool)
 
-> My original implementation was certainly buggy and not on par with markdeep. I'm
-> grateful for the folks who've helped smooth out the rough edges, and I've
+> My original implementation was certainly buggy and not on par with markdeep.
+
+-- Block
+
+> I'm grateful for the folks who've helped smooth out the rough edges, and I've
 > updated this project to reflect the good changes made in the Hugo fork,
 > including a long--overdue go.mod.
-{{< footer />}}
+
+--- Quote
 
 ```goat
       .               .                .               .--- 1
diff --git a/themes/default/layouts/partials/function-content.html b/themes/default/layouts/partials/function-content.html
index de68946..bc90549 100644
--- a/themes/default/layouts/partials/function-content.html
+++ b/themes/default/layouts/partials/function-content.html
@@ -10,6 +10,25 @@
     replaceRE "</figure></p>" "</figure>" |
 -}}
 
+{{- $blockquoteFooterEnDash := delimit (findRE `</blockquote>\n<p>&ndash;.*</p>` .Content 1) "" -}}
+{{- $blockquoteFooterEmDash := delimit (findRE `</blockquote>\n<p>&mdash;.*</p>` .Content 1) "" -}}
+
+{{- $blockquoteFooterFixedEnDash := $blockquoteFooterEnDash |
+      replaceRE "</blockquote>\n<p>" "<footer><cite>"                |
+      replaceRE "</p>"               "</cite></footer></blockquote>" |
+-}}
+
+{{- $blockquoteFooterFixedEmDash := $blockquoteFooterEmDash |
+      replaceRE "</blockquote>\n<p>" "<footer><cite>"                |
+      replaceRE "</p>"               "</cite></footer></blockquote>" |
+-}}
+
+{{-
+  $content = $content |
+  replaceRE $blockquoteFooterEnDash $blockquoteFooterFixedEnDash |
+  replaceRE $blockquoteFooterEmDash $blockquoteFooterFixedEmDash |
+-}}
+
 {{- if $empty -}}
  {{- $content = "This message contains no content." -}}
 {{- end -}}
diff --git a/themes/default/layouts/shortcodes/footer.html b/themes/default/layouts/shortcodes/footer.html
deleted file mode 100644
index 579913d..0000000
--- a/themes/default/layouts/shortcodes/footer.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{{- $text := default "Block Quote" (.Get "text" | default (.Get 0)) -}}
-
-{{- if gt (len .Inner) 1 -}}
-  {{ $text = .Inner }}
-{{- end -}}
-
-<span>{{ $text | markdownify }}</span>
diff --git a/themes/default/layouts/shortcodes/version.html b/themes/default/layouts/shortcodes/version.html
index 10e29c5..c34a53d 100644
--- a/themes/default/layouts/shortcodes/version.html
+++ b/themes/default/layouts/shortcodes/version.html
@@ -1,4 +1,4 @@
-{{- $version := "0.11.5" -}}
+{{- $version := "0.11.6" -}}
 {{- $number := default false (.Get "number" | default (.Get 0)) -}}
 {{- $clone  := default false (.Get "clone"  | default (.Get 1)) -}}