mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-25 23:03:15 +00:00
Code Issues Releases Wiki Activity

these changes remove most of the <p> tags from the right sidebar, without changing the layout too much. The tab buttons are a little bit higher but this will be adjusted with the next CSS tweaks.

Browse Source
This commit is contained in:
Mario Pietsch 2014-04-09 21:12:10 +02:00
parent 5821165ec5
commit 70a2db34d1
4 changed files with 55 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/ui/PageMacros.tid
View File

@ -3,30 +3,31 @@ title: $:/core/ui/PageMacros
\define colour(name) \define colour(name)
<$transclude tiddler={{$:/palette}} index="$name$"/> <$transclude tiddler={{$:/palette}} index="$name$"/>
\end \end
\define color(name) \define color(name)
<<colour $name$>> <<colour $name$>>
\end \end
\define tabs(tabsList,default,state:"$:/state/tab") \define tabs(tabsList,default,state:"$:/state/tab")
<div class="tw-tab-buttons"> <div class="tw-tab-buttons">
<$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> </$button> </$transclude>
</$list> </$button>
</$list>
</div> </div>
<div class="tw-tab-divider"/> <div class="tw-tab-divider"/>
<div class="tw-tab-content"> <div class="tw-tab-content">
<$list filter="$tabsList$" variable="currentTab">
<$list filter="$tabsList$" variable="currentTab"> <$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$">
<$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$"> <$transclude tiddler=<<currentTab>> mode="block"/>
</$reveal>
<$transclude tiddler=<<currentTab>>/> </$list>
</$reveal>
</$list>
</div> </div>
\end \end
\define wikitext-example(src) \define wikitext-example(src)
``` ```
$src$ $src$
@ -43,6 +44,7 @@ $src$
$$$ $$$
\end \end
\define wikitext-example-without-html(src) \define wikitext-example-without-html(src)
``` ```
$src$ $src$
@ -53,9 +55,11 @@ Renders as:
$src$ $src$
\end \end
\define lingo-base() \define lingo-base()
$:/lingo/ $:/lingo/
\end \end
\define lingo(title) \define lingo(title)
{{$(lingo-base)$$title$}} {{$(lingo-base)$$title$}}
\end \end

33
core/ui/PageTemplate/sidebar.tid
View File

@ -2,24 +2,15 @@ title: $:/core/ui/PageTemplate/sidebar
tags: $:/tags/PageTemplate tags: $:/tags/PageTemplate
<$scrollable fallthrough="no" class="tw-sidebar-scrollable"> <$scrollable fallthrough="no" class="tw-sidebar-scrollable">
<div class="sidebar-header">
<div class="sidebar-header"> <$reveal state="$:/state/sidebar" type="match" text="yes" default="yes" retain="yes">
<div class="tw-site-title">{{$:/SiteTitle}}</div>
<$reveal state="$:/state/sidebar" type="match" text="yes" default="yes" retain="yes"> <div class="tw-site-subtitle">{{$:/SiteSubtitle}}</div>
<div class="tw-page-controls">
<div class="tw-site-title">{{$:/SiteTitle}}</div> <$list filter="[all[tiddlers+shadows]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"> <$transclude tiddler=<<listItem>>/>
<div class="tw-site-subtitle">{{$:/SiteSubtitle}}</div> </$list>
</div>
<div class="tw-page-controls"> {{$:/core/ui/SideBarLists}}
</$reveal>
<$list filter="[all[tiddlers+shadows]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list> </div>
</$scrollable>
</div>
{{$:/core/ui/SideBarLists}}
</$reveal>
</div>
</$scrollable>

48
core/ui/SideBarLists.tid
View File

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

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

@ -368,6 +368,10 @@ a.tw-tiddlylink-external:hover {
width: 60%; width: 60%;
} }
.tw-search {
padding-top: .5em;
}
.tw-search a svg { .tw-search a svg {
height: 0.75em; height: 0.75em;
} }
@ -449,7 +453,7 @@ a.tw-tiddlylink-external:hover {
overflow-x: auto; overflow-x: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
margin: 0 0 0 -42px; margin: 0 0 0 -42px;
padding: 70px 0 28px 42px; padding: 99px 0 28px 42px;
} }
.story-river { .story-river {