From 482f7a92ae96c2fed602e0b182322eb7abf4aea7 Mon Sep 17 00:00:00 2001
From: Simon Huber <huber.simon@protonmail.com>
Date: Thu, 11 Jun 2020 13:14:09 +0200
Subject: [PATCH] Type EditTemplate: show dropdown at correct position ...
 (#4686)

* Refactor type edittemplate for correct positioning...

... of type dropdown

* Refactor classes
---
 core/ui/EditTemplate/type.tid      | 5 ++++-
 themes/tiddlywiki/vanilla/base.tid | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid
index f9068fa8a..edf4bf982 100644
--- a/core/ui/EditTemplate/type.tid
+++ b/core/ui/EditTemplate/type.tid
@@ -3,8 +3,10 @@ tags: $:/tags/EditTemplate
 
 \define lingo-base() $:/language/EditTemplate/
 \whitespace trim
+<em class="tc-edit"><<lingo Type/Prompt>></em>&nbsp;&nbsp;
+<div class="tc-type-selector-wrapper">
 <div class="tc-type-selector"><$fieldmangler>
-<em class="tc-edit"><<lingo Type/Prompt>></em>&nbsp;&nbsp;<$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>
+<$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>
 
 <div class="tc-block-dropdown-wrapper">
@@ -24,3 +26,4 @@ tags: $:/tags/EditTemplate
 </$reveal>
 </$set>
 </div>
+</div>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 4a1d3a1c8..a76a098b9 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1303,7 +1303,11 @@ html body.tc-body.tc-single-tiddler-window {
 }
 
 .tc-type-selector .tc-edit-typeeditor {
-	width: 20%;
+	width: auto;
+}
+
+.tc-type-selector-wrapper {
+	display: inline-block;
 }
 
 .tc-edit-tags {