From 2327dd043f982f3df31c9ddb30ffabe0af8e6112 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Thu, 3 Oct 2024 13:19:23 +0100
Subject: [PATCH] Revert "Fix alignment in tiddler subtitle (#8659)"

This reverts commit f4f1ae6b9bc2391a769172e23749e5b79661bb3d.
---
 core/ui/ViewTemplate/subtitle/default.tid     |  2 +-
 core/ui/ViewTemplate/subtitle/modifier.tid    |  2 +-
 .../tiddler-subtitle/subtitle-modified.tid    | 23 ------------------
 .../subtitle-modifier-modified.tid            | 24 -------------------
 4 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 editions/test/tiddlers/tests/data/tiddler-subtitle/subtitle-modified.tid
 delete mode 100644 editions/test/tiddlers/tests/data/tiddler-subtitle/subtitle-modifier-modified.tid

diff --git a/core/ui/ViewTemplate/subtitle/default.tid b/core/ui/ViewTemplate/subtitle/default.tid
index 5c55712fab..99042c95ea 100644
--- a/core/ui/ViewTemplate/subtitle/default.tid
+++ b/core/ui/ViewTemplate/subtitle/default.tid
@@ -4,7 +4,7 @@ title: $:/core/ui/ViewTemplate/subtitle/default
 <$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
 <div class="tc-subtitle tc-clearfix">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler">
-<$transclude tiddler=<<subtitleTiddler>> mode="inline"/>
+<$transclude tiddler=<<subtitleTiddler>> mode="inline"/><$list-join>&nbsp;</$list-join>
 </$list>
 </div>
 </$reveal>
diff --git a/core/ui/ViewTemplate/subtitle/modifier.tid b/core/ui/ViewTemplate/subtitle/modifier.tid
index e4062380df..8437ada9b8 100644
--- a/core/ui/ViewTemplate/subtitle/modifier.tid
+++ b/core/ui/ViewTemplate/subtitle/modifier.tid
@@ -1,4 +1,4 @@
 title: $:/core/ui/ViewTemplate/subtitle/modifier
 tags: $:/tags/ViewTemplate/Subtitle
 
-<%if [{!!modifier}!is[blank]] %><$link to={{!!modifier}}/><%endif%>
\ No newline at end of file
+<$link to={{!!modifier}}/>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/tiddler-subtitle/subtitle-modified.tid b/editions/test/tiddlers/tests/data/tiddler-subtitle/subtitle-modified.tid
deleted file mode 100644
index 0191aaccf7..0000000000
--- a/editions/test/tiddlers/tests/data/tiddler-subtitle/subtitle-modified.tid
+++ /dev/null
@@ -1,23 +0,0 @@
-title: Subtitle/modified
-description: Tiddler ViewTemplate Subtitle modified only
-type: text/vnd.tiddlywiki-multiple
-import: [all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]] $:/core/ui/ViewTemplate/subtitle/default
-tags: $:/tags/wiki-test-spec
-
-title: $:/language/Tiddler/DateFormat
-
-[UTC]DDth MMM YYYY at hh12:0mmam
-+
-title: Output
-
-\whitespace trim
-{{test||$:/core/ui/ViewTemplate/subtitle/default}}
-+
-title: test
-modified: 20241003111606000
-
-text
-+
-title: ExpectedResult
-
-<p><div class=" tc-reveal"><div class="tc-subtitle tc-clearfix">3rd October 2024 at 11:16am</div></div></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/tiddler-subtitle/subtitle-modifier-modified.tid b/editions/test/tiddlers/tests/data/tiddler-subtitle/subtitle-modifier-modified.tid
deleted file mode 100644
index c060faeae1..0000000000
--- a/editions/test/tiddlers/tests/data/tiddler-subtitle/subtitle-modifier-modified.tid
+++ /dev/null
@@ -1,24 +0,0 @@
-title: Subtitle/modifier-modified
-description: Tiddler ViewTemplate Subtitle. Show modifier and modified in UTC format
-type: text/vnd.tiddlywiki-multiple
-import: [all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]] $:/core/ui/ViewTemplate/subtitle/default
-tags: $:/tags/wiki-test-spec
-
-title: $:/language/Tiddler/DateFormat
-
-[UTC]DDth MMM YYYY at hh12:0mmam
-+
-title: Output
-
-\whitespace trim
-{{test||$:/core/ui/ViewTemplate/subtitle/default}}
-+
-title: test
-modifier: test-user
-modified: 20241003111606000
-
-text
-+
-title: ExpectedResult
-
-<p><div class=" tc-reveal"><div class="tc-subtitle tc-clearfix"><a class="tc-tiddlylink tc-tiddlylink-missing" href="#test-user">test-user</a>3rd October 2024 at 11:16am</div></div></p>
\ No newline at end of file