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

Remove indenting

Browse Source 
It didn’t work very well, and was giving us spans where there should be
divs in the tab control.
This commit is contained in:
Jermolene 2014-06-21 11:16:35 +01:00
parent f12d7bb6c0
commit fb5c44a875
2 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
core/ui/SideBarLists.tid
View File

@ -1,23 +1,34 @@
title: $:/core/ui/SideBarLists title: $:/core/ui/SideBarLists
<div class="tw-sidebar-lists"> <div class="tw-sidebar-lists">
<div class="tw-search">
<$edit-text tiddler="$:/temp/search" type="search" tag="input"/> <div class="tw-search">
<$reveal state="$:/temp/search" type="nomatch" text=""> <$edit-text tiddler="$:/temp/search" type="search" tag="input"/>
<$linkcatcher to="$:/temp/search"> <$reveal state="$:/temp/search" type="nomatch" text="">
<$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link> <$linkcatcher to="$:/temp/search">
</$linkcatcher> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link>
</$reveal> </$linkcatcher>
<$reveal state="$:/temp/search" type="match" text="">&nbsp;<$link to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="btn-invisible">&hellip;</$link> </$reveal>
</$reveal> <$reveal state="$:/temp/search" type="match" text="">&nbsp;<$link to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="btn-invisible">&hellip;</$link>
</div> </$reveal>
<$reveal state="$:/temp/search" type="nomatch" text=""> </div>
<div class="tw-search-results">
{{$:/language/Search/Matches}} <$reveal state="$:/temp/search" type="nomatch" text="">
<$list filter="[!is[system]search{$:/temp/search}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
</div> <div class="tw-search-results">
</$reveal>
<$reveal state="$:/temp/search" type="match" text=""> {{$:/language/Search/Matches}}
<<tabs "[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]" "$:/core/ui/SideBar/Open" "$:/state/tab/sidebar">>
</$reveal> <$list filter="[!is[system]search{$:/temp/search}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
</div>
</$reveal>
<$reveal state="$:/temp/search" type="match" text="">
<<tabs "[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]" "TableOfContents" "$:/state/tab/sidebar">>
</$reveal>
</div> </div>

28
core/wiki/macros/tabs.tid
View File

@ -4,19 +4,23 @@ tags: $:/tags/Macro
\define tabs(tabsList,default,state:"$:/state/tab",class) \define tabs(tabsList,default,state:"$:/state/tab",class)
<div class="tw-tab-set $class$"> <div class="tw-tab-set $class$">
<div class="tw-tab-buttons $class$"> <div class="tw-tab-buttons $class$">
<$list filter="$tabsList$" variable="currentTab"> <$list filter="$tabsList$" variable="currentTab">
<$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tw-tab-selected"> <$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tw-tab-selected">
<$transclude tiddler=<<currentTab>> field="caption"> <$transclude tiddler=<<currentTab>> field="caption">
<$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/> <$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/>
</$transclude> </$transclude>
</$button> </$button>
</$list> </$list>
</div><div class="tw-tab-divider $class$"/><div class="tw-tab-content $class$"> </div><div class="tw-tab-divider $class$"/><div class="tw-tab-content $class$">
<$list filter="$tabsList$" variable="currentTab"> <$list filter="$tabsList$" variable="currentTab">
<$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$">
<$transclude tiddler=<<currentTab>> mode="block"/> <$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$">
</$reveal>
</$list> <$transclude tiddler=<<currentTab>> mode="block"/>
</$reveal>
</$list>
</div> </div>
</div> </div>
\end \end