From 2a5afc536e383a2d3609d653e3ba8381108b57e0 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel@bitbadger.solutions>
Date: Fri, 3 Jun 2022 07:10:55 -0400
Subject: [PATCH] Push URL for page/post edit

- Style tweaks on devotion theme
---
 src/MyWebLog/Handlers/Admin.fs              |  1 +
 src/MyWebLog/appsettings.json               |  2 +-
 src/MyWebLog/themes/admin/page-edit.liquid  |  2 +-
 src/MyWebLog/themes/admin/post-edit.liquid  |  2 +-
 src/MyWebLog/wwwroot/themes/awftw/style.css | 38 ++++++++++++---------
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/MyWebLog/Handlers/Admin.fs b/src/MyWebLog/Handlers/Admin.fs
index e3a8e64..507487f 100644
--- a/src/MyWebLog/Handlers/Admin.fs
+++ b/src/MyWebLog/Handlers/Admin.fs
@@ -9,6 +9,7 @@ let private themes () =
     Directory.EnumerateDirectories "themes"
     |> Seq.map (fun it -> it.Split Path.DirectorySeparatorChar |> Array.last)
     |> Seq.filter (fun it -> it <> "admin")
+    |> Seq.sort
     |> Seq.map (fun it -> KeyValuePair.Create (it, it))
     |> Array.ofSeq
 
diff --git a/src/MyWebLog/appsettings.json b/src/MyWebLog/appsettings.json
index a9922f3..49f8a42 100644
--- a/src/MyWebLog/appsettings.json
+++ b/src/MyWebLog/appsettings.json
@@ -3,7 +3,7 @@
     "hostname": "data02.bitbadger.solutions",
     "database": "myWebLog_dev"
   },
-  "Generator": "myWebLog 2.0-alpha28",
+  "Generator": "myWebLog 2.0-alpha29",
   "Logging": {
     "LogLevel": {
       "MyWebLog.Handlers": "Debug"
diff --git a/src/MyWebLog/themes/admin/page-edit.liquid b/src/MyWebLog/themes/admin/page-edit.liquid
index 1baf201..e5db77e 100644
--- a/src/MyWebLog/themes/admin/page-edit.liquid
+++ b/src/MyWebLog/themes/admin/page-edit.liquid
@@ -1,6 +1,6 @@
 <h2 class="my-3">{{ page_title }}</h2>
 <article>
-  <form action="{{ "admin/page/save" | relative_link }}" method="post">
+  <form action="{{ "admin/page/save" | relative_link }}" method="post" hx-push-url="true">
     <input type="hidden" name="{{ csrf.form_field_name }}" value="{{ csrf.request_token }}">
     <input type="hidden" name="pageId" value="{{ model.page_id }}">
     <div class="container">
diff --git a/src/MyWebLog/themes/admin/post-edit.liquid b/src/MyWebLog/themes/admin/post-edit.liquid
index ce61b78..2760ee4 100644
--- a/src/MyWebLog/themes/admin/post-edit.liquid
+++ b/src/MyWebLog/themes/admin/post-edit.liquid
@@ -1,6 +1,6 @@
 <h2 class="my-3">{{ page_title }}</h2>
 <article>
-  <form action="{{ "admin/post/save" | relative_link }}" method="post">
+  <form action="{{ "admin/post/save" | relative_link }}" method="post" hx-push-url="true">
     <input type="hidden" name="{{ csrf.form_field_name }}" value="{{ csrf.request_token }}">
     <input type="hidden" name="postId" value="{{ model.post_id }}">
     <div class="container">
diff --git a/src/MyWebLog/wwwroot/themes/awftw/style.css b/src/MyWebLog/wwwroot/themes/awftw/style.css
index 168a3a5..2018d6f 100644
--- a/src/MyWebLog/wwwroot/themes/awftw/style.css
+++ b/src/MyWebLog/wwwroot/themes/awftw/style.css
@@ -23,12 +23,17 @@
     --audio-bkg-color: hsl(0, 0%, 10%);
     --audio-text-color: hsl(0, 0%, 50%);
   }
-  blockquote.bible {
+  blockquote {
     background-color: var(--bkg-color);
     background-image: linear-gradient(hsl(0, 0%, 85%), hsl(0, 0%, 85%)), url('../img/paper.png') repeat;
     background-blend-mode: soft-light;
     color: hsl(0, 0%, 95%);
   }
+  blockquote.standard {
+    background: unset;
+    color: unset;
+    border-top: none;
+  }
   .ref {
     text-shadow: white 0 0 6px, white 0 0 6px, white 0 0 6px, white 0 0 6px;
   }
@@ -176,20 +181,24 @@ hr.sidebar-sep {
   background-color: var(--accent-color);
 }
 blockquote {
-  margin: 1rem 2rem 1rem 1rem;
-  border-left: solid 3px var(--accent-color);
-  padding-left: 1rem;
-}
-blockquote.bible {
+  margin: 1rem 2rem;
+  /* from bible */
   padding: 11px;
-  margin-left: 2rem;
   border: 0;
   background: var(--bkg-color) url('img/paper.png') repeat;
   font-family: Quicksand, serif;
   border-top: solid 1px black;
   display: flow-root;
+  font-size: 1.2rem;
 }
-blockquote.bible cite {
+blockquote.standard {
+  margin: 1rem 2rem 1rem 1rem;
+  border-left: solid 3px var(--accent-color);
+}
+blockquote p.cite {
+  margin-bottom: 0;
+}
+blockquote cite {
   display: block;
   padding-right: 11px;
   text-align: right;
@@ -204,7 +213,7 @@ blockquote.bible cite {
 .ref {
   color: red;
 }
-blockquote.bible sup {
+blockquote sup {
   color: var(--superscript-color);
   padding-right: .35rem;
 }
@@ -214,13 +223,10 @@ blockquote.bible sup {
 .u {
   text-decoration: underline;
 }
-blockquote {
-  font-size: 1.2rem;
-}
-blockquote footer cite {
+blockquote.standard footer cite {
   font-style: normal;
 }
-blockquote footer cite::before {
+blockquote.standard footer cite::before {
   content: ", ";
 }
 cite {
@@ -270,9 +276,9 @@ h1 {
   margin-bottom: 1.2rem;
 }
 .item-heading {
-  margin: -.4rem;
-  margin-bottom: .4rem;
+  margin: -.4rem -.4rem .4rem -.4rem;
   border-bottom: solid 2px var(--link-color);
+  padding-top: .4rem;
   padding-bottom: .2rem;
   text-align: center;
   background-color: var(--heading-bkg-color);