Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix toc indentation problem #7627

Merged
merged 3 commits into from
Jul 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/wiki/macros/toc.tid
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ tags: $:/tags/Macro

\define toc-caption()
\whitespace trim
<span class="tc-toc-caption">
<span class="tc-toc-caption tc-tiny-gap-left">
<$set name="tv-wikilinks" value="no">
<$transclude field="caption">
<$view field="title"/>
Expand Down Expand Up @@ -145,7 +145,7 @@ tags: $:/tags/Macro
<$qualify name="toc-state" title={{{ [[$:/state/toc]addsuffix<__path__>addsuffix[-]addsuffix<currentTiddler>] }}}>
<$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
<li class=<<toc-item-class>>>
<$list filter="[all[current]tagging[]$sort$limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button> <$view field='caption'><$view field='title'/></$view>">
<$list filter="[all[current]tagging[]$sort$limit[1]]" variable="ignore" emptyMessage="""<$button class="tc-btn-invisible">{{$:/core/images/blank}}</$button><span class="toc-item-muted"><<toc-caption>></span>""">
<$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
<$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
<$transclude tiddler=<<toc-closed-icon>> />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
caption: Fourth-Caption
created: 20150221194405000
modified: 20211114013601188
tags: Contents [[Table-of-Contents Demonstrations]]
title: Fourth
type: text/vnd.tiddlywiki

<<.toc-lorem>>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,15 @@ created: 20150221194423000
modified: 20211114013601189
tags: SecondThree [[Table-of-Contents Demonstrations]]
title: SecondThreeThree
toc-link: no
type: text/vnd.tiddlywiki

''Important''

It's important that this tiddler has no "child" to be able to visually test every possible toc code-path.

* This tiddler has a field ''toc-link: no''
* Do not tag any other tiddler with the title of this one



<<.toc-lorem>>
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
caption: Third-Caption
created: 20150221194436000
list: ThirdOne ThirdTwo ThirdThree
modified: 20211114013601191
tags: Contents [[Table-of-Contents Demonstrations]]
title: Third
type: text/vnd.tiddlywiki

<<.toc-lorem>>
10 changes: 3 additions & 7 deletions themes/tiddlywiki/vanilla/base.tid
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ button svg, button img, label svg, label img {
}

button:disabled.tc-btn-invisible {
cursor: default;
cursor: default;
color: <<colour muted-foreground>>;
}

Expand Down Expand Up @@ -2779,15 +2779,11 @@ input.tc-palette-manager-colour-input {
white-space: nowrap;
}

.tc-table-of-contents button {
.tc-table-of-contents button,
.tc-table-of-contents .toc-item-muted {
color: <<colour sidebar-foreground>>;
}

button + .tc-toc-caption,
button > .tc-toc-caption{
margin-left: .25em;
}

.tc-table-of-contents svg {
width: 0.7em;
height: 0.7em;
Expand Down
Loading