From 17a36726faa836e924b8c6309e83ae8955a9462a Mon Sep 17 00:00:00 2001
From: Simon Huber <huber.simon@protonmail.com>
Date: Thu, 11 Jun 2020 13:18:31 +0200
Subject: [PATCH] Fields EditTemplate: Correct positioning of dropdown (#4687)

* Add wrapper div to fields EditTemplate

* Add classes

* remove obsolete span

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

diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid
index 47f582112..dd0b49a65 100644
--- a/core/ui/EditTemplate/fields.tid
+++ b/core/ui/EditTemplate/fields.tid
@@ -71,9 +71,9 @@ $value={{{ [<newFieldValueTiddler>get[text]] }}}/>
 <em class="tc-edit">
 <<lingo Fields/Add/Prompt>>&nbsp;&nbsp;
 </em>
-<span class="tc-edit-field-add-name">
+<div class="tc-edit-field-add-name-wrapper">
 <$edit-text tiddler=<<newFieldNameTiddler>> tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} focusPopup=<<qualify "$:/state/popup/field-dropdown">> class="tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[fields]then[true]] ~[[false]] }}} cancelPopups="yes"/>
-</span>&nbsp;
+&nbsp;
 <$button popup=<<qualify "$:/state/popup/field-dropdown">> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Field/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Field/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button>&nbsp;
 <$reveal state=<<qualify "$:/state/popup/field-dropdown">> type="nomatch" text="" default="">
 <div class="tc-block-dropdown tc-edit-type-dropdown">
@@ -101,6 +101,7 @@ $value={{{ [<newFieldValueTiddler>get[text]] }}}/>
 </$set>
 </div>
 </$reveal>
+</div>
 <span class="tc-edit-field-add-value">
 <$set name="currentTiddlerCSSescaped" value={{{ [<currentTiddler>escapecss[]] }}}>
 <$keyboard key="((add-field))" actions=<<new-field-actions>>>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index a76a098b9..3b52dfaf6 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1404,9 +1404,12 @@ html body.tc-body.tc-single-tiddler-window {
 	vertical-align: middle;
 }
 
-.tc-edit-field-add-name {
+.tc-edit-field-add-name-wrapper input.tc-edit-texteditor {
+	width: auto;
+}
+
+.tc-edit-field-add-name-wrapper {
 	display: inline-block;
-	width: 15%;
 }
 
 .tc-edit-field-add-value {