mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-01-26 08:56:52 +00:00
Code Issues Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
BurningTreeC 2024-11-01 16:54:19 +01:00
parent bbcfba75aa
commit d652f17aee
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/wiki/macros/sidebar-resizer.tid
View File

@ -123,8 +123,8 @@ title: $:/core/procedures/sidebar-resizer
\end \end
\function get.story-sidebar.padding() \function get.story-sidebar.padding()
[<get.theme.option sidebarposition>match[left]then<storyPaddingLeft>] [<get.theme.option sidebarposition>match[left]then<currentTiddler>subtract<storyPaddingLeft>]
:else[<storyPaddingRight>] :else[<currentTiddler>subtract<storyPaddingRight>]
\end \end
\procedure set-storywidth-storyright-actions() \procedure set-storywidth-storyright-actions()
@ -140,7 +140,7 @@ title: $:/core/procedures/sidebar-resizer
storyPaddingLeft={{{ [convert.to.pixels.locally<storyPaddingLeftValue>] }}} storyPaddingLeft={{{ [convert.to.pixels.locally<storyPaddingLeftValue>] }}}
storyPaddingRightValue={{{ [<storyPaddingRightTiddler>!is[blank]is[tiddler]get[text]] :else[<storyPaddingRightTiddler>!is[blank]is[missing]then[0px]] :else[<get.theme.metric storypaddingright>] }}} storyPaddingRightValue={{{ [<storyPaddingRightTiddler>!is[blank]is[tiddler]get[text]] :else[<storyPaddingRightTiddler>!is[blank]is[missing]then[0px]] :else[<get.theme.metric storypaddingright>] }}}
storyPaddingRight={{{ [convert.to.pixels.locally<storyPaddingRightValue>] }}} storyPaddingRight={{{ [convert.to.pixels.locally<storyPaddingRightValue>] }}}
sidebarMinWidth={{{ [convert.to.pixels.locally<sidebarMinWidthValue>subtract<get.story-sidebar.padding>] }}} sidebarMinWidth={{{ [convert.to.pixels.locally<sidebarMinWidthValue>] :map[<get.story-sidebar.padding>] }}}
storyLeftValue={{{ [<storyLeftTiddler>!is[blank]get[text]] :else[<get.theme.metric storyleft>] }}} storyLeftValue={{{ [<storyLeftTiddler>!is[blank]get[text]] :else[<get.theme.metric storyleft>] }}}
storyLeft={{{ [convert.to.pixels.locally<storyLeftValue>] }}} storyLeft={{{ [convert.to.pixels.locally<storyLeftValue>] }}}
clampedDiff={{{ [<storyWidthStart>add<storyLeft>add<sidebarMinWidth>subtract<widgetNodeWidth>compare:number:gt[0]] ~0 }}} clampedDiff={{{ [<storyWidthStart>add<storyLeft>add<sidebarMinWidth>subtract<widgetNodeWidth>compare:number:gt[0]] ~0 }}}

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

@ -1025,14 +1025,14 @@ button.tc-btn-invisible.tc-remove-tag-button {
overflow-y: auto; overflow-y: auto;
overflow-x: auto; overflow-x: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
margin: 0 0 0 -42px; margin: 0 0 0 -<<get.theme.metric storypaddingright>>;
padding: 71px 0 28px 42px; padding: 71px 0 28px 42px;
} }
.tc-sidebar-left .tc-sidebar-scrollable { .tc-sidebar-left .tc-sidebar-scrollable {
left: 0; left: 0;
right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),<<get.theme.metric storyright>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + <<get.theme.metric storypaddingleft>>)); right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),<<get.theme.metric storyright>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + <<get.theme.metric storypaddingleft>>));
margin: 0 0 0 0; margin: 0 -<<get.theme.metric storypaddingleft>> 0 0;
} }
html[dir="rtl"] .tc-sidebar-scrollable { html[dir="rtl"] .tc-sidebar-scrollable {
@ -1054,13 +1054,16 @@ button.tc-btn-invisible.tc-remove-tag-button {
} }
.tc-sidebar-left .tc-story-river { .tc-sidebar-left .tc-story-river {
left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}),calc(100% - <<get.theme.metric storywidth>> - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} + <<get.theme.metric storypaddingleft>>)); display: flex;
width: clamp({{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}},<<get.theme.metric storywidth>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + <<get.theme.metric storypaddingleft>>)); align-items: flex-end;
flex-direction: column;
left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} - <<get.theme.metric storypaddingleft>>),calc(100% - <<get.theme.metric storywidth>> - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}));
width: clamp({{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}},<<get.theme.metric storywidth>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + <<get.theme.metric storypaddingleft>>));
right: max(0px,calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}})); right: max(0px,calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}));
} }
html[dir="rtl"] .tc-sidebar-left .tc-story-river { html[dir="rtl"] .tc-sidebar-left .tc-story-river {
left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}),calc(100% - <<get.theme.metric storywidth>> - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}})); left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}),calc(100% - <<get.theme.metric storywidth>> - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}));
right: max(0px,{{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}); right: max(0px,{{$:/themes/tiddlywiki/vanilla/metrics/storyleft}});
} }
@ -1190,9 +1193,7 @@ button.tc-btn-invisible.tc-remove-tag-button {
} }
.tc-sidebar-left .tc-tiddler-frame { .tc-sidebar-left .tc-tiddler-frame {
left: auto;
width: clamp(0px,calc(<<get.theme.metric tiddlerwidth>>),100%); width: clamp(0px,calc(<<get.theme.metric tiddlerwidth>>),100%);
right: 0;
} }
<<if-no-sidebar " <<if-no-sidebar "
@ -1527,6 +1528,7 @@ html body.tc-body.tc-single-tiddler-window {
margin-right: max(0px,{{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}); margin-right: max(0px,{{$:/themes/tiddlywiki/vanilla/metrics/storyleft}});
margin-left: clamp({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}},<<get.theme.metric sidebarwidth>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}})); margin-left: clamp({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}},<<get.theme.metric sidebarwidth>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}));
left: auto; left: auto;
width: auto;
right: 0; right: 0;
padding-right: <<get.theme.metric storypaddingright>>; padding-right: <<get.theme.metric storypaddingright>>;
padding-left: 0; padding-left: 0;