From ae2619f8df7b6d0cebc56ea17914fe18e337835a Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sat, 24 Nov 2018 08:38:25 +0100 Subject: [PATCH 01/12] more-popup - don't use qualify --- core/ui/ViewToolbar/more-tiddler-actions.tid | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/ui/ViewToolbar/more-tiddler-actions.tid b/core/ui/ViewToolbar/more-tiddler-actions.tid index b344dc4d187..6d5b39c67cd 100644 --- a/core/ui/ViewToolbar/more-tiddler-actions.tid +++ b/core/ui/ViewToolbar/more-tiddler-actions.tid @@ -7,7 +7,7 @@ description: {{$:/language/Buttons/More/Hint}} \define config-title() $:/config/ViewToolbarButtons/Visibility/$(listItem)$ \end -<$button popup=<> tooltip={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<> selectedClass="tc-selected"> +<$button popupTitle={{{ [[$:/state/popup/more/]addsuffix] }}} tooltip={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<> selectedClass="tc-selected"> <$list filter="[prefix[yes]]"> {{$:/core/images/down-arrow}} @@ -18,7 +18,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ -<$reveal state=<> type="popup" position="belowleft" animate="yes"> +<$reveal stateTitle={{{ [[$:/state/popup/more/]addsuffix] }}} type="popup" position="belowleft" animate="yes">
@@ -30,7 +30,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] -[[$:/core/ui/Buttons/more-tiddler-actions]]" variable="listItem"> -<$reveal type="match" state=<> text="hide"> +<$reveal type="match" stateTitle=<> text="hide"> <$set name="tv-config-toolbar-class" filter="[] [encodeuricomponent[]addprefix[tc-btn-]]"> @@ -50,4 +50,4 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
- \ No newline at end of file + From 44e5b916186ab0181c9a6e2619d16f10ba5cd96b Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sat, 24 Nov 2018 09:17:11 +0100 Subject: [PATCH 02/12] sticky-titles macro light + compatible version --- core/wiki/macros/CSS.tid | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid index a5b68ea0723..aabbb080643 100644 --- a/core/wiki/macros/CSS.tid +++ b/core/wiki/macros/CSS.tid @@ -74,3 +74,54 @@ column-count: $columns$; \define if-background-attachment(text) <$reveal state="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" type="nomatch" text="">$text$ \end + +\define set-zindex-for-sticky-titles() +\rules only +[data-tiddler-title="$(cssEscapedTitle)$"] .tc-tiddler-title { +z-index: $(zIndex)$; +} +\end + +\define get-full-zindex-list() +$(zIndexFilter)$ $(tiddlerList)$ +\end + +\define sticky-titles() +\whitespace trim +<$reveal state="$:/themes/tiddlywiki/vanilla/options/stickytitles" type="match" text="yes"> +`` +.tc-tiddler-title { + position: -webkit-sticky; + position: -moz-sticky; + position: -o-sticky; + position: -ms-sticky; + position: sticky; + top: 0px; + background: ``<>``; + z-index: 500; +} +`` +<$set name="morePopupTiddler" value={{{ [all[tiddlers]removeprefix[$:/state/popup/more/]] }}}> +<$vars cssEscapedTitle={{{ [stringify[]] }}} zIndex="520"> +<> + +<$set name="tiddlerList" filter="[list[$:/StoryList]allafterlimit[20]]"> +<$list filter="[enlist]" variable="zIndexTiddler"> +<$set name="zIndexFilter" filter="[range[1,500]addsuffix]"> +<$set name="zIndexList" value=<>> +<$set name="tiddlerIndex" value={{{ [list[$:/StoryList]allafterlimit[20]] +[allbefore] [] +[count[]] }}}> +<$set name="reversedTiddler" value={{{ [enlistreverse[]nth] }}}> +<$set name="zIndex" value={{{ [enlistreverse[]] +[allbeforecount[]] }}}> +<$set name="cssEscapedTitle" value={{{ [stringify[]] }}}> +<> + + + + + + + + + + +\end From 27a4210b66a8d1fb7cad3f61ed2270064174cca9 Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sat, 24 Nov 2018 09:18:53 +0100 Subject: [PATCH 03/12] use sticky-titles macro --- themes/tiddlywiki/vanilla/base.tid | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 401022128fa..70439e3ee77 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -844,8 +844,7 @@ button.tc-untagged-label { background-color: <>; border: 1px solid <>; } - -{{$:/themes/tiddlywiki/vanilla/sticky}} +<> .tc-tiddler-info { padding: 14px 42px 14px 42px; From b12ecf119d139395fd9e0f1fa16887e07e1e199d Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sat, 24 Nov 2018 09:19:22 +0100 Subject: [PATCH 04/12] Delete sticky.tid --- themes/tiddlywiki/vanilla/sticky.tid | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 themes/tiddlywiki/vanilla/sticky.tid diff --git a/themes/tiddlywiki/vanilla/sticky.tid b/themes/tiddlywiki/vanilla/sticky.tid deleted file mode 100644 index 407f4466545..00000000000 --- a/themes/tiddlywiki/vanilla/sticky.tid +++ /dev/null @@ -1,16 +0,0 @@ -title: $:/themes/tiddlywiki/vanilla/sticky - -<$reveal state="$:/themes/tiddlywiki/vanilla/options/stickytitles" type="match" text="yes"> -`` -.tc-tiddler-title { - position: -webkit-sticky; - position: -moz-sticky; - position: -o-sticky; - position: -ms-sticky; - position: sticky; - top: 0px; - background: ``<>``; - z-index: 500; -} -`` - From 6e515627b4ec7405106f4215b0a6d926264743bb Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sat, 24 Nov 2018 09:54:22 +0100 Subject: [PATCH 05/12] remove testing artefact --- core/wiki/macros/CSS.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid index aabbb080643..e0328fcd148 100644 --- a/core/wiki/macros/CSS.tid +++ b/core/wiki/macros/CSS.tid @@ -111,7 +111,7 @@ $(zIndexFilter)$ $(tiddlerList)$ <$set name="zIndexList" value=<>> <$set name="tiddlerIndex" value={{{ [list[$:/StoryList]allafterlimit[20]] +[allbefore] [] +[count[]] }}}> <$set name="reversedTiddler" value={{{ [enlistreverse[]nth] }}}> -<$set name="zIndex" value={{{ [enlistreverse[]] +[allbeforecount[]] }}}> +<$set name="zIndex" value={{{ [enlist] +[allbeforecount[]] }}}> <$set name="cssEscapedTitle" value={{{ [stringify[]] }}}> <> From 4173d7a6a79c451f0a572c9704f4b9e5ca35ee9c Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sat, 24 Nov 2018 10:57:54 +0100 Subject: [PATCH 06/12] logic for assigning css to data-tag to utility... ... macro called `assign-css-to-data-tag` --- core/wiki/macros/CSS.tid | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid index e0328fcd148..e889594a215 100644 --- a/core/wiki/macros/CSS.tid +++ b/core/wiki/macros/CSS.tid @@ -75,17 +75,28 @@ column-count: $columns$; <$reveal state="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" type="nomatch" text="">$text$ \end -\define set-zindex-for-sticky-titles() +\define create-data-tag() \rules only -[data-tiddler-title="$(cssEscapedTitle)$"] .tc-tiddler-title { -z-index: $(zIndex)$; +$(classesBefore)$[$(dataTag)$="$(escapedTitle)$"]$(classesAfter)$ { +$(cssContent)$ } \end +\define assign-css-to-data-tag(tag:"data-tiddler-title",text:"",title:"",classesBefore:"",classesAfter:"") +\whitespace trim +<$vars escapedTitle={{{ [<__title__>escapedatacss[]] }}} cssContent=<<__text__>> dataTag=<<__tag__>> classesBefore=<<__classesBefore__>> classesAfter=<<__classesAfter__>>> +<> + +\end + \define get-full-zindex-list() $(zIndexFilter)$ $(tiddlerList)$ \end +\define sticky-z-index() +z-index: $(zIndex)$; +\end + \define sticky-titles() \whitespace trim <$reveal state="$:/themes/tiddlywiki/vanilla/options/stickytitles" type="match" text="yes"> @@ -112,9 +123,7 @@ $(zIndexFilter)$ $(tiddlerList)$ <$set name="tiddlerIndex" value={{{ [list[$:/StoryList]allafterlimit[20]] +[allbefore] [] +[count[]] }}}> <$set name="reversedTiddler" value={{{ [enlistreverse[]nth] }}}> <$set name="zIndex" value={{{ [enlist] +[allbeforecount[]] }}}> -<$set name="cssEscapedTitle" value={{{ [stringify[]] }}}> -<> - +<$macrocall $name="assign-css-to-data-tag" title=<> text=<> classesAfter=" .tc-tiddler-title"/> From 7937e63ad73f39407f18afa949d82106c6cc2d81 Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sat, 24 Nov 2018 11:58:18 +0100 Subject: [PATCH 07/12] remove sticky-titles macro from vanilla base --- themes/tiddlywiki/vanilla/base.tid | 1 - 1 file changed, 1 deletion(-) diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 70439e3ee77..f750590d8ac 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -844,7 +844,6 @@ button.tc-untagged-label { background-color: <>; border: 1px solid <>; } -<> .tc-tiddler-info { padding: 14px 42px 14px 42px; From b6030205735a7cfa7e9940aa8d7503ed3e000f81 Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sat, 24 Nov 2018 11:59:12 +0100 Subject: [PATCH 08/12] add sticky ($:/themes/tiddlywiki/vanilla/sticky) --- themes/tiddlywiki/vanilla/sticky.tid | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 themes/tiddlywiki/vanilla/sticky.tid diff --git a/themes/tiddlywiki/vanilla/sticky.tid b/themes/tiddlywiki/vanilla/sticky.tid new file mode 100644 index 00000000000..e8f35c588b8 --- /dev/null +++ b/themes/tiddlywiki/vanilla/sticky.tid @@ -0,0 +1,4 @@ +title: $:/themes/tiddlywiki/vanilla/sticky +tags: $:/tags/Stylesheet + +<> From 4a4503b16cbb339bc76cb766192f671d3502eee7 Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sat, 24 Nov 2018 13:16:45 +0100 Subject: [PATCH 09/12] assuming that escapecss is coming --- core/wiki/macros/CSS.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid index e889594a215..6d0e0ecda46 100644 --- a/core/wiki/macros/CSS.tid +++ b/core/wiki/macros/CSS.tid @@ -84,7 +84,7 @@ $(cssContent)$ \define assign-css-to-data-tag(tag:"data-tiddler-title",text:"",title:"",classesBefore:"",classesAfter:"") \whitespace trim -<$vars escapedTitle={{{ [<__title__>escapedatacss[]] }}} cssContent=<<__text__>> dataTag=<<__tag__>> classesBefore=<<__classesBefore__>> classesAfter=<<__classesAfter__>>> +<$vars escapedTitle={{{ [<__title__>escapecss[]] }}} cssContent=<<__text__>> dataTag=<<__tag__>> classesBefore=<<__classesBefore__>> classesAfter=<<__classesAfter__>>> <> \end From d8d4f43c2cb00d763068d3969e792234b000a7a5 Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sun, 25 Nov 2018 16:45:17 +0100 Subject: [PATCH 10/12] fix macrocall --- core/wiki/macros/CSS.tid | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid index 6d0e0ecda46..1be61074dde 100644 --- a/core/wiki/macros/CSS.tid +++ b/core/wiki/macros/CSS.tid @@ -113,9 +113,7 @@ z-index: $(zIndex)$; } `` <$set name="morePopupTiddler" value={{{ [all[tiddlers]removeprefix[$:/state/popup/more/]] }}}> -<$vars cssEscapedTitle={{{ [stringify[]] }}} zIndex="520"> -<> - +<$macrocall $name="assign-css-to-data-tag" title=<> text="z-index: 520;" classesAfter=" .tc-tiddler-title"/> <$set name="tiddlerList" filter="[list[$:/StoryList]allafterlimit[20]]"> <$list filter="[enlist]" variable="zIndexTiddler"> <$set name="zIndexFilter" filter="[range[1,500]addsuffix]"> From eb7006e92b92619c1ad2bdf0e8786fb890ec103f Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sun, 25 Nov 2018 17:24:04 +0100 Subject: [PATCH 11/12] Update CSS.tid --- core/wiki/macros/CSS.tid | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid index 1be61074dde..0fd6e6b3dc9 100644 --- a/core/wiki/macros/CSS.tid +++ b/core/wiki/macros/CSS.tid @@ -77,14 +77,14 @@ column-count: $columns$; \define create-data-tag() \rules only -$(classesBefore)$[$(dataTag)$="$(escapedTitle)$"]$(classesAfter)$ { -$(cssContent)$ +$(classesBefore)$[$(tagName)$="$(escapedTagValue)$"]$(classesAfter)$ { +$(tagStyles)$ } \end -\define assign-css-to-data-tag(tag:"data-tiddler-title",text:"",title:"",classesBefore:"",classesAfter:"") +\define assign-css-to-data-tag(tagName:"data-tiddler-title",tagStyles:"",tagValue:"",classesBefore:"",classesAfter:"") \whitespace trim -<$vars escapedTitle={{{ [<__title__>escapecss[]] }}} cssContent=<<__text__>> dataTag=<<__tag__>> classesBefore=<<__classesBefore__>> classesAfter=<<__classesAfter__>>> +<$vars escapedTagValue={{{ [<__tagValue__>escapecss[]] }}} tagStyles=<<__tagStyles__>> tagName=<<__tagName__>> classesBefore=<<__classesBefore__>> classesAfter=<<__classesAfter__>>> <> \end @@ -113,7 +113,7 @@ z-index: $(zIndex)$; } `` <$set name="morePopupTiddler" value={{{ [all[tiddlers]removeprefix[$:/state/popup/more/]] }}}> -<$macrocall $name="assign-css-to-data-tag" title=<> text="z-index: 520;" classesAfter=" .tc-tiddler-title"/> +<$macrocall $name="assign-css-to-data-tag" tagValue=<> tagStyles="z-index: 520;" classesAfter=" .tc-tiddler-title"/> <$set name="tiddlerList" filter="[list[$:/StoryList]allafterlimit[20]]"> <$list filter="[enlist]" variable="zIndexTiddler"> <$set name="zIndexFilter" filter="[range[1,500]addsuffix]"> @@ -121,7 +121,7 @@ z-index: $(zIndex)$; <$set name="tiddlerIndex" value={{{ [list[$:/StoryList]allafterlimit[20]] +[allbefore] [] +[count[]] }}}> <$set name="reversedTiddler" value={{{ [enlistreverse[]nth] }}}> <$set name="zIndex" value={{{ [enlist] +[allbeforecount[]] }}}> -<$macrocall $name="assign-css-to-data-tag" title=<> text=<> classesAfter=" .tc-tiddler-title"/> +<$macrocall $name="assign-css-to-data-tag" tagValue=<> tagStyles=<> classesAfter=" .tc-tiddler-title"/> From 4f9e4a572874abe0946ca90640633f4199267719 Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sun, 25 Nov 2018 18:28:49 +0100 Subject: [PATCH 12/12] Update CSS.tid --- core/wiki/macros/CSS.tid | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid index 0fd6e6b3dc9..6cd04d0b217 100644 --- a/core/wiki/macros/CSS.tid +++ b/core/wiki/macros/CSS.tid @@ -77,14 +77,14 @@ column-count: $columns$; \define create-data-tag() \rules only -$(classesBefore)$[$(tagName)$="$(escapedTagValue)$"]$(classesAfter)$ { +$(classesBefore)$[$(tagName)$$(tagSelector)$"$(escapedTagValue)$"]$(classesAfter)$ { $(tagStyles)$ } \end -\define assign-css-to-data-tag(tagName:"data-tiddler-title",tagStyles:"",tagValue:"",classesBefore:"",classesAfter:"") +\define assign-css-to-data-tag(tagName:"data-tiddler-title",tagSelector:"=",tagValue:"",tagStyles:"",classesBefore:"",classesAfter:"") \whitespace trim -<$vars escapedTagValue={{{ [<__tagValue__>escapecss[]] }}} tagStyles=<<__tagStyles__>> tagName=<<__tagName__>> classesBefore=<<__classesBefore__>> classesAfter=<<__classesAfter__>>> +<$vars escapedTagValue={{{ [<__tagValue__>escapecss[]] }}} tagStyles=<<__tagStyles__>> tagName=<<__tagName__>> tagSelector=<<__tagSelector__>> classesBefore=<<__classesBefore__>> classesAfter=<<__classesAfter__>>> <> \end