From 936df822c601b5f32ec74e5a7e4c3a58551d4339 Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sun, 10 Nov 2024 15:51:43 +0100 Subject: [PATCH] move styles for editor and preview into stylesheet --- core/ui/EditTemplate/body/default.tid | 11 +---------- core/wiki/macros/sidebar-resizer.tid | 7 ++----- core/wiki/macros/sliders.tid | 10 +--------- themes/tiddlywiki/vanilla/sidebar-resizer.tid | 14 ++++++++++++++ 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/core/ui/EditTemplate/body/default.tid b/core/ui/EditTemplate/body/default.tid index 04c2f9d52..e1e97de32 100644 --- a/core/ui/EditTemplate/body/default.tid +++ b/core/ui/EditTemplate/body/default.tid @@ -8,14 +8,6 @@ title: $:/core/ui/EditTemplate/body/default \function get.tc-tiddler-preview-preview.class() tc-tiddler-preview-preview [addprefix[tc-tiddler-preview-preview-identified-]] +[join[ ]] -\function get.preview.width() [get[text]] - -\function get.style.grid-template-columns() -[!match[yes]then[1fr]] -:else[is[tiddler]then[calc(100% - ]addsuffixaddsuffix[) ]addsuffix[calc(]addsuffixaddsuffix[)]] -:else[[repeat(2, minmax(0px, 1fr))]] -\end - \function get.slider.condition() [match[yes]] :else[[no]] \define config-visibility-title() @@ -28,8 +20,7 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$ \procedure tp-tiddler-editor-preview()
match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}} - style.grid-template-columns=<>> + class={{{ [match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [match[yes]then[tc-tiddler-preview-identified-]addsuffix] [[tc-tiddler-editor]] +[join[ ]] }}}> <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/> diff --git a/core/wiki/macros/sidebar-resizer.tid b/core/wiki/macros/sidebar-resizer.tid index e5334d805..2892c1f19 100644 --- a/core/wiki/macros/sidebar-resizer.tid +++ b/core/wiki/macros/sidebar-resizer.tid @@ -195,7 +195,7 @@ title: $:/core/procedures/sidebar-resizer storyMinWidthValue={{{ [!is[blank]is[tiddler]get[text]] :else[!is[blank]is[missing]then] :else[] }}} storyMinWidth={{{ [convert.to.pixels.locally] }}} sidebarMinWidthValue={{{ [!is[blank]is[tiddler]get[text]] :else[!is[blank]is[missing]then] :else[] }}} - storyLeftValue={{{ [!is[blank]is[tiddler]get[text]] :else[!is[blank]is[missing]then] :else[] }}} + storyLeftValue={{{ [!is[blank]is[tiddler]get[text]] :else[!is[blank]is[missing]then] :else[] }}} storyLeft={{{ [convert.to.pixels.locally] }}} sidebarMinWidth={{{ [convert.to.pixels.locally] }}} storySidebarOffset={{{ [convert.to.pixels.locally] :else[[0]] }}} @@ -353,7 +353,7 @@ title: $:/core/procedures/sidebar-resizer <% endif %> \end -\function get.resizer.class() tc-sidebar-resizer [is[tiddler]then[tc-resizer-active]] [] [addsuffix[-]addsuffixsha256[]addprefix[tc-sidebar-resizer-]] +[join[ ]] +\function get.resizer.class() tc-sidebar-resizer [is[tiddler]then[tc-resizer-active]] [] [addsuffix[-]addsuffixsha256[]addprefix[tc-sidebar-resizer-identified-]] +[join[ ]] \function get.active.class(class) [] [] [] [is[tiddler]then[tc-resizer-active]] +[join[ ]] @@ -520,9 +520,6 @@ title: $:/core/procedures/sidebar-resizer
> - style.position=<> - style.left=<> - style.width=<> /> <% endif %> diff --git a/core/wiki/macros/sliders.tid b/core/wiki/macros/sliders.tid index 0c2bb7b2c..141b0ee39 100644 --- a/core/wiki/macros/sliders.tid +++ b/core/wiki/macros/sliders.tid @@ -4,11 +4,7 @@ code-body: yes \procedure editor-preview-slider(class:"",width:"100%",minHeight:"10px",template:"",mode:"block",sliderWidth:"12px",padding:"12px",sliderCondition:"yes",leftMinWidth:"0%",rightMinWidth:"0%") \import $:/core/procedures/sidebar-resizer -\function get.resizer.style.position() absolute -\function get.template-right.width() [get[text]] :else[[50%]] -\function get.resizer.style.left() [[calc(100% - ]addsuffixaddsuffix[ - ]addsuffixaddsuffix[)]] -\function get.resizer.style.width() [] -\function set.throttling() no +\function set.throttling() yes \function get.template.left() \function get.preview.slider.class() [] \function get.left.minwidth() [] @@ -91,7 +87,3 @@ code-body: yes
\end - -\procedure table-slider() - -\end diff --git a/themes/tiddlywiki/vanilla/sidebar-resizer.tid b/themes/tiddlywiki/vanilla/sidebar-resizer.tid index 14867c240..da86b0a5b 100644 --- a/themes/tiddlywiki/vanilla/sidebar-resizer.tid +++ b/themes/tiddlywiki/vanilla/sidebar-resizer.tid @@ -177,12 +177,26 @@ code-body: yes min-width: 0px; } +div[class*="tc-sidebar-resizer-identified-"]:not(.tc-main-sidebar-resizer) { + position: absolute; + left: calc(50% - <>); + width: <>; +} + <$list filter="[all[tiddlers]prefix[$:/state/resizer/previewwidth-]]" variable="previewWidthTiddler"> <$let identifier={{{ [removeprefix[$:/state/resizer/previewwidth-]] }}} width={{{ [get[text]] }}}> + .tc-tiddler-frame .tc-tiddler-editor.tc-tiddler-preview.tc-tiddler-preview-identified-<> { + grid-template-columns: calc(100% - <>) <>; + } + + .tc-sidebar-resizer.tc-sidebar-resizer-identified-<> { + left: calc(100% - <> - <>); + } + <%if [compare:number:lteq[1]] %> .tc-tiddler-preview-preview-identified-<> {