From 17e2b208e851a610f3e37deb209c757da56f990f Mon Sep 17 00:00:00 2001
From: Simon Huber <huber.simon@protonmail.com>
Date: Mon, 10 Aug 2020 10:25:14 +0200
Subject: [PATCH] Fix #4794 - tc-type-selector-wrapper not containing tc-edit
 (#4798)

* Update type.tid

* Update base.tid
---
 core/ui/EditTemplate/type.tid      | 4 +++-
 themes/tiddlywiki/vanilla/base.tid | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid
index edf4bf982..81c190186 100644
--- a/core/ui/EditTemplate/type.tid
+++ b/core/ui/EditTemplate/type.tid
@@ -3,8 +3,9 @@ tags: $:/tags/EditTemplate
 
 \define lingo-base() $:/language/EditTemplate/
 \whitespace trim
+<div class="tc-edit-type-selector-wrapper">
 <em class="tc-edit"><<lingo Type/Prompt>></em>&nbsp;&nbsp;
-<div class="tc-type-selector-wrapper">
+<div class="tc-type-selector-dropdown-wrapper">
 <div class="tc-type-selector"><$fieldmangler>
 <$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] ~[[false]] }}} cancelPopups="yes"/>&nbsp;<$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button>&nbsp;<$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}</$button>
 </$fieldmangler></div>
@@ -27,3 +28,4 @@ tags: $:/tags/EditTemplate
 </$set>
 </div>
 </div>
+</div>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 5f2e13c5b..49ccd1ad8 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1323,7 +1323,7 @@ html body.tc-body.tc-single-tiddler-window {
 	width: auto;
 }
 
-.tc-type-selector-wrapper {
+.tc-type-selector-dropdown-wrapper {
 	display: inline-block;
 }