diff --git a/core/templates/static.template.css.tid b/core/templates/static.template.css.tid index 07399b8a6..c754329ac 100644 --- a/core/templates/static.template.css.tid +++ b/core/templates/static.template.css.tid @@ -1,4 +1,4 @@ title: $:/core/templates/static.template.css {{{ [is[system]type[text/css]] ||$:/core/templates/plain-text-tiddler}}} -{{$:/core/styles/base}} +{{{ [tag[$:/tags/stylesheet]] [is[shadow]tag[$:/tags/stylesheet]] ||$:/core/templates/wikified-tiddler}}} diff --git a/core/templates/static.template.html.tid b/core/templates/static.template.html.tid index 169d74750..555a101ef 100644 --- a/core/templates/static.template.html.tid +++ b/core/templates/static.template.html.tid @@ -14,10 +14,11 @@ type: text/vnd.tiddlywiki-html {{{ [is[system]type[text/css]] ||$:/core/templates/css-tiddler}}} +{{$:/StaticBanner||$:/core/templates/html-tiddler}} {{$:/core/ui/PageTemplate||$:/core/templates/html-tiddler}} diff --git a/core/templates/static.tiddler.html.tid b/core/templates/static.tiddler.html.tid index 6bd2fa066..409e10e4b 100644 --- a/core/templates/static.tiddler.html.tid +++ b/core/templates/static.tiddler.html.tid @@ -11,6 +11,7 @@ title: $:/core/templates/static.tiddler.html `{{$:/core/wiki/title}}` +`{{$:/StaticBanner||$:/core/templates/html-tiddler}}`
`<$view tiddler="$:/core/ui/ViewTemplate" format="htmlwikified"/>` diff --git a/core/templates/wikified-tiddler.tid b/core/templates/wikified-tiddler.tid new file mode 100644 index 000000000..e130a2f85 --- /dev/null +++ b/core/templates/wikified-tiddler.tid @@ -0,0 +1,3 @@ +title: $:/core/templates/wikified-tiddler + +<$view field="text" format="wikified" /> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/system/StaticBanner.tid b/editions/tw5.com/tiddlers/system/StaticBanner.tid new file mode 100644 index 000000000..99328d81a --- /dev/null +++ b/editions/tw5.com/tiddlers/system/StaticBanner.tid @@ -0,0 +1,3 @@ +title: $:/StaticBanner + +
This page is part of a static HTML representation of the TiddlyWiki at http://five.tiddlywiki.com/
diff --git a/editions/tw5.com/tiddlers/talkytalky/TalkyTalky.tid b/editions/tw5.com/tiddlers/talkytalky/TalkyTalky.tid index 906f1a66c..9b3060638 100644 --- a/editions/tw5.com/tiddlers/talkytalky/TalkyTalky.tid +++ b/editions/tw5.com/tiddlers/talkytalky/TalkyTalky.tid @@ -25,7 +25,7 @@ Store your tiddlers in a single HTML file along with the JS # Create tiddlers, show links, missing, orphans, tags, tagging, references # Use missing tiddlers to find a typo # Show shadow tiddlers and system tiddlers -# Show stylesheet handling - [[$:/core/styles/base]] +# Show stylesheet handling - [[$:/themes/snowwhite/base]] # Drag an image from the file system # Use the image in a tiddler # Edit the image diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid index cca71554b..55efb72f2 100644 --- a/themes/tiddlywiki/snowwhite/base.tid +++ b/themes/tiddlywiki/snowwhite/base.tid @@ -1,4 +1,4 @@ -title: $:/core/styles/base +title: $:/themes/tiddlywiki/snowwhite/base tags: [[$:/tags/stylesheet]] \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline @@ -44,7 +44,7 @@ background-image: -ms-linear-gradient($gradient$); ** Start with the normalize CSS reset, and then belay some of its effects */ -{{$:/core/styles/reset}} +{{$:/themes/tiddlywiki/snowwhite/reset}} *, input[type="search"] { box-sizing: border-box; @@ -61,9 +61,9 @@ html { } body { - font-size: {{$:/core/styles/metrics##fontsize}}; - line-height: {{$:/core/styles/metrics##lineheight}}; - background-color: {{$:/core/styles/colourmappings##pagebackground}}; + font-size: {{$:/themes/tiddlywiki/snowwhite/metrics##fontsize}}; + line-height: {{$:/themes/tiddlywiki/snowwhite/metrics##lineheight}}; + background-color: {{$:/themes/tiddlywiki/snowwhite/colourmappings##pagebackground}}; word-wrap: break-word; } @@ -123,7 +123,7 @@ a.tw-tiddlylink { text-decoration: none; font-style: normal; font-weight: normal; - color: {{$:/core/styles/colourmappings##linkforeground}}; + color: {{$:/themes/tiddlywiki/snowwhite/colourmappings##linkforeground}}; } .tw-sidebar-lists a.tw-tiddlylink { @@ -346,7 +346,7 @@ a.tw-tiddlylink-missing { .tw-tiddler-frame { position: relative; margin-bottom: 2em; - background-color: {{$:/core/styles/colourmappings##tiddlerbackground}}; + background-color: {{$:/themes/tiddlywiki/snowwhite/colourmappings##tiddlerbackground}}; } .tw-tiddler-info { @@ -477,8 +477,8 @@ canvas.tw-edit-bitmapeditor { .tw-drop-down { min-width: 20em; - border: 1px solid {{$:/core/styles/colourmappings##dropdownborder}}; - background-color: {{$:/core/styles/colourmappings##dropdownbackground}}; + border: 1px solid {{$:/themes/tiddlywiki/snowwhite/colourmappings##dropdownborder}}; + background-color: {{$:/themes/tiddlywiki/snowwhite/colourmappings##dropdownbackground}}; <> <> padding: 0.5em 0em 0.5em 0em; @@ -492,8 +492,8 @@ canvas.tw-edit-bitmapeditor { } .tw-drop-down a:hover { - color: {{$:/core/styles/colourmappings##linkbackground}}; - background-color: {{$:/core/styles/colourmappings##linkforeground}}; + color: {{$:/themes/tiddlywiki/snowwhite/colourmappings##linkbackground}}; + background-color: {{$:/themes/tiddlywiki/snowwhite/colourmappings##linkforeground}}; text-decoration: none; } @@ -666,3 +666,16 @@ canvas.tw-edit-bitmapeditor { <> border: none; } + +/* +** Alerts +*/ + +.tw-alert { + <> + margin: 0.5em 0.5em 0.5em 0.5em; + padding: 1em 1em 1em 1em; + border: 3px solid #DBB727; + background-color: rgb(250, 210, 50); +} + diff --git a/themes/tiddlywiki/snowwhite/colourmappings.tid b/themes/tiddlywiki/snowwhite/colourmappings.tid index a95419e0b..1278835eb 100644 --- a/themes/tiddlywiki/snowwhite/colourmappings.tid +++ b/themes/tiddlywiki/snowwhite/colourmappings.tid @@ -1,9 +1,9 @@ -title: $:/core/styles/colourmappings +title: $:/themes/tiddlywiki/snowwhite/colourmappings type: application/x-tiddler-dictionary -tiddlerbackground: {{$:/core/styles/colours##background}} -pagebackground: {{$:/core/styles/colours##pagebackground}} -linkbackground: {{$:/core/styles/colours##background}} -linkforeground: {{$:/core/styles/colours##primary}} -dropdownbackground: {{$:/core/styles/colours##background}} -dropdownborder: {{$:/core/styles/colours##medium}} +tiddlerbackground: {{$:/themes/tiddlywiki/snowwhite/colours##background}} +pagebackground: {{$:/themes/tiddlywiki/snowwhite/colours##pagebackground}} +linkbackground: {{$:/themes/tiddlywiki/snowwhite/colours##background}} +linkforeground: {{$:/themes/tiddlywiki/snowwhite/colours##primary}} +dropdownbackground: {{$:/themes/tiddlywiki/snowwhite/colours##background}} +dropdownborder: {{$:/themes/tiddlywiki/snowwhite/colours##medium}} diff --git a/themes/tiddlywiki/snowwhite/colours.tid b/themes/tiddlywiki/snowwhite/colours.tid index bf6763a54..35b3e9271 100644 --- a/themes/tiddlywiki/snowwhite/colours.tid +++ b/themes/tiddlywiki/snowwhite/colours.tid @@ -1,4 +1,4 @@ -title: $:/core/styles/colours +title: $:/themes/tiddlywiki/snowwhite/colours type: application/x-tiddler-dictionary primary: `#5959C0` diff --git a/themes/tiddlywiki/snowwhite/metrics.tid b/themes/tiddlywiki/snowwhite/metrics.tid index 73fe80a31..89a51f0d2 100644 --- a/themes/tiddlywiki/snowwhite/metrics.tid +++ b/themes/tiddlywiki/snowwhite/metrics.tid @@ -1,4 +1,4 @@ -title: $:/core/styles/metrics +title: $:/themes/tiddlywiki/snowwhite/metrics type: application/x-tiddler-dictionary fontsize: `14px` diff --git a/themes/tiddlywiki/snowwhite/reset.tid b/themes/tiddlywiki/snowwhite/reset.tid index 1ef972c83..265294582 100644 --- a/themes/tiddlywiki/snowwhite/reset.tid +++ b/themes/tiddlywiki/snowwhite/reset.tid @@ -1,4 +1,4 @@ -title: $:/core/styles/reset +title: $:/themes/tiddlywiki/snowwhite/reset type: text/plain /*! normalize.css v2.1.0 | MIT License | git.io/normalize */