From 769842c4db0e2044a7d7b391c000a256ef22700b Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Sat, 8 Nov 2014 17:51:35 +0000
Subject: [PATCH] Improved fix for h2 title bar markup

Fixes the problem @pmario raised at
https://github.com/Jermolene/TiddlyWiki5/commit/09a3f94d79fc6eacbfd46c86
594748e996191eb2#commitcomment-8488743
---
 core/ui/ViewTemplate/title.tid     | 12 ++++++------
 themes/tiddlywiki/vanilla/base.tid |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index 91c5fafae..88e1c532d 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -8,7 +8,7 @@ fill:$(foregroundColor)$;
 $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 \end
 <div class="tc-tiddler-title">
-<h2 class="tc-titlebar">
+<div class="tc-titlebar">
 <span class="tc-tiddler-controls">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list>
 </span>
@@ -18,16 +18,16 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 </span>
 </$set>
 <$list filter="[all[current]removeprefix[$:/]]">
-<span class="tc-title" title={{$:/language/SystemTiddler/Tooltip}}>
+<h2 class="tc-title" title={{$:/language/SystemTiddler/Tooltip}}>
 <span class="tc-system-title-prefix">$:/</span><$text text=<<currentTiddler>>/>
-</span>
+</h2>
 </$list>
 <$list filter="[all[current]!prefix[$:/]]">
-<span class="tc-title">
+<h2 class="tc-title">
 <$view field="title"/>
-</span>
-</$list>
 </h2>
+</$list>
+</div>
 
 <$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup" animate="yes" retain="yes">
 
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index c0fa69721..435173b29 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -617,6 +617,11 @@ button.tc-untagged-label {
 	color: <<colour muted-foreground>>;
 }
 
+.tc-titlebar h2 {
+	font-size: 1em;
+	display: inline;
+}
+
 .tc-titlebar img {
 	height: 1em;
 }