mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-26 10:00:34 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1532 from aelocson/icon-macros

Browse Source 
Macros and styles for tips and warnings
This commit is contained in:
Jeremy Ruston 2015-02-27 18:27:57 +00:00
commit b30d43215c
5 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editions/tw5.com/tiddlers/concepts/HardAndSoftLinks.tid
View File

@ -1,5 +1,5 @@
created: 20150123220237000 created: 20150123220237000
modified: 20150124120447000 modified: 20150226163104000
tags: Concepts tags: Concepts
title: Hard and Soft Links title: Hard and Soft Links
type: text/vnd.tiddlywiki type: text/vnd.tiddlywiki
@ -12,4 +12,4 @@ A link is <<.def "soft">> if it is:
* supplied via a [[macro|Macros]] or [[variable|Variables]] * supplied via a [[macro|Macros]] or [[variable|Variables]]
* generated by a link widget whose <<.attr to>> attribute is a transclusion, macro or variable * generated by a link widget whose <<.attr to>> attribute is a transclusion, macro or variable
Soft links are not detected by link-related filter operators such as <<.olink backlinks>>, <<.olink links>>, <<.olink all>> and <<.olink is>>. <$macrocall $name=".warning" _="""Soft links are not detected by link-related filter operators such as <<.olink backlinks>>, <<.olink links>>, <<.olink all>> and <<.olink is>>."""/>

4
editions/tw5.com/tiddlers/filters/Introduction to Filters.tid
View File

@ -1,12 +1,12 @@
created: 20140410101941871 created: 20140410101941871
modified: 20150221152006000 modified: 20150226162742000
tags: Learning Filters tags: Learning Filters
title: Introduction to filter notation title: Introduction to filter notation
type: text/vnd.tiddlywiki type: text/vnd.tiddlywiki
<<.preamble """This explains the basics of writing a [[filter|Filters]] to select a set of tiddlers. For a more technical presentation, see [[Filter Syntax]].""">> <<.preamble """This explains the basics of writing a [[filter|Filters]] to select a set of tiddlers. For a more technical presentation, see [[Filter Syntax]].""">>
<$macrocall $name=".note" _="""Filters do nothing if you just type them into a tiddler on their own. They need a context. An easy way to experiment with filters is to type them into the <<.advancedsearch-tab Filter>> tab of [[Advanced Search|$:/AdvancedSearch]]."""/> <$macrocall $name=".tip" _="""Filters do nothing if you just type them into a tiddler on their own. They need a context. An easy way to experiment with filters is to type them into the <<.advancedsearch-tab Filter>> tab of [[Advanced Search|$:/AdvancedSearch]]."""/>
The simplest case is where you already know exactly which tiddlers you want. Type each title in double square brackets, with a space between each one and the next: The simplest case is where you already know exactly which tiddlers you want. Type each title in double square brackets, with a space between each one and the next:

8
editions/tw5.com/tiddlers/styleguide/Documentation Macros.tid
View File

@ -1,5 +1,5 @@
created: 20150110182600000 created: 20150110182600000
modified: 20150221181632000 modified: 20150226161700000
title: Documentation Macros title: Documentation Macros
tags: [[Improving TiddlyWiki Documentation]] tags: [[Improving TiddlyWiki Documentation]]
@ -14,6 +14,12 @@ The following macros are used throughout ~TiddlyWiki's documentation. Their name
|.strong |major emphasis within a tiddler |<<.strong Important!>> | |.strong |major emphasis within a tiddler |<<.strong Important!>> |
|.word |a mention of an ordinary word or phrase |<<.word "hello world">> | |.word |a mention of an ordinary word or phrase |<<.word "hello world">> |
!Advice
|!Macro |!Used for |!Example |
|^.tip |^hints and tips |<<.tip "Turn your screen on, otherwise<br>you won't be able to see much.">> |
|^.warning |^warning advice |<<.warning "Make a backup of your file<br>before your upgrade.">> |
!Blocks !Blocks
|!Macro |!Used for | |!Macro |!Used for |
|.preamble |an introductory sentence that stands apart from the rest of the tiddler | |.preamble |an introductory sentence that stands apart from the rest of the tiddler |

6
editions/tw5.com/tiddlers/system/doc-macros.tid
View File

@ -1,5 +1,5 @@
created: 20150117152607000 created: 20150117152607000
modified: 20150221200048000 modified: 20150226161637000
title: $:/editions/tw5.com/doc-macros title: $:/editions/tw5.com/doc-macros
tags: $:/tags/Macro tags: $:/tags/Macro
@ -62,6 +62,10 @@ tags: $:/tags/Macro
\define .button(_) <span class="doc-button">{{$:/core/ui/Buttons/$_$!!caption}}</span> \define .button(_) <span class="doc-button">{{$:/core/ui/Buttons/$_$!!caption}}</span>
\define .tip(_) <div class="doc-icon-block"><div class="doc-block-icon">{{$:/core/images/tip}}</div> $_$</div>
\define .warning(_) <div class="doc-icon-block"><div class="doc-block-icon">{{$:/core/images/warning}}</div> $_$</div>
\end
\define .state-prefix() $:/state/editions/tw5.com/ \define .state-prefix() $:/state/editions/tw5.com/
\define .lorem() \define .lorem()

20
editions/tw5.com/tiddlers/system/doc-styles.tid
View File

@ -1,5 +1,5 @@
created: 20150117152612000 created: 20150117152612000
modified: 20150221141207000 modified: 20150226162159000
title: $:/editions/tw5.com/doc-styles title: $:/editions/tw5.com/doc-styles
tags: $:/tags/Stylesheet tags: $:/tags/Stylesheet
@ -143,3 +143,21 @@ tr.doc-table-subheading {
.doc-table.before-tiddler-body { .doc-table.before-tiddler-body {
margin-top: 2em; margin-top: 2em;
} }
.doc-icon-block {
border-left: 2px solid <<colour code-border>>;
margin-left: 3em;
padding-left: 0.6em;
position: relative;
}
.doc-block-icon {
position: absolute;
left: -3em;
top: 0.2em;
}
.doc-block-icon .tc-image-tip {
fill: <<colour primary>>;
}
.doc-block-icon .tc-image-warning {
fill: <<colour alert-highlight>>;
}