mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-27 03:57:21 +00:00
Code Issues Releases Wiki Activity

Fields EditTemplate: Correct positioning of dropdown (#4687)

Browse Source 
* Add wrapper div to fields EditTemplate

* Add classes

* remove obsolete span

* Update base.tid
This commit is contained in:
Simon Huber 2020-06-11 13:18:31 +02:00 committed by GitHub
parent 482f7a92ae
commit 17a36726fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/ui/EditTemplate/fields.tid
View File

@ -71,9 +71,9 @@ $value={{{ [<newFieldValueTiddler>get[text]] }}}/>
<em class="tc-edit"> <em class="tc-edit">
<<lingo Fields/Add/Prompt>>&nbsp;&nbsp; <<lingo Fields/Add/Prompt>>&nbsp;&nbsp;
</em> </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"/> <$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; <$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=""> <$reveal state=<<qualify "$:/state/popup/field-dropdown">> type="nomatch" text="" default="">
<div class="tc-block-dropdown tc-edit-type-dropdown"> <div class="tc-block-dropdown tc-edit-type-dropdown">
@ -101,6 +101,7 @@ $value={{{ [<newFieldValueTiddler>get[text]] }}}/>
</$set> </$set>
</div> </div>
</$reveal> </$reveal>
</div>
<span class="tc-edit-field-add-value"> <span class="tc-edit-field-add-value">
<$set name="currentTiddlerCSSescaped" value={{{ [<currentTiddler>escapecss[]] }}}> <$set name="currentTiddlerCSSescaped" value={{{ [<currentTiddler>escapecss[]] }}}>
<$keyboard key="((add-field))" actions=<<new-field-actions>>> <$keyboard key="((add-field))" actions=<<new-field-actions>>>

7
themes/tiddlywiki/vanilla/base.tid
View File

@ -1404,9 +1404,12 @@ html body.tc-body.tc-single-tiddler-window {
vertical-align: middle; 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; display: inline-block;
width: 15%;
} }
.tc-edit-field-add-value { .tc-edit-field-add-value {