Skip to content

Commit

Permalink
Deprecate $:/tags/stylesheet in favour of $:/tags/Stylesheet
Browse files Browse the repository at this point in the history
A warning message appears at the top of the story river if any
`$:/tags/stylesheet` tags are found.

Fixing the first half of #824
  • Loading branch information
Jermolene committed Sep 10, 2014
1 parent d45c417 commit f6ff0a7
Show file tree
Hide file tree
Showing 23 changed files with 32 additions and 22 deletions.
4 changes: 4 additions & 0 deletions core/ui/PageStylesheet.tid
Expand Up @@ -6,4 +6,8 @@ title: $:/core/ui/PageStylesheet
<$transclude mode="block"/>
</$list>

<$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]">
<$transclude mode="block"/>
</$list>

</$importvariables>
6 changes: 6 additions & 0 deletions core/ui/PageTemplate/story.tid
Expand Up @@ -3,6 +3,12 @@ tags: $:/tags/PageTemplate

<section class="tc-story-river">

<$list filter="[all[shadows+tiddlers]tag[$:/tags/stylesheet]!has[draft.of]]">

WARNING: tag "$:/tags/stylesheet" on <$link><$view field="title"/></$link> should be replaced with "$:/tags/Stylesheet"

</$list>

<section class="story-backdrop">

<$list filter="[all[shadows+tiddlers]tag[$:/tags/AboveStory]!has[draft.of]]">
Expand Down
2 changes: 1 addition & 1 deletion editions/highlightdemo/tiddlers/HelloThere.tid
Expand Up @@ -14,6 +14,6 @@ To add this plugin to your own TiddlyWiki5, just drag this link to the browser w

! Adding Themes

You can add themes from highlight.js by copying the CSS to a new tiddler and tagging it with [[$:/tags/stylesheet]]. The available themes can be found on GitHub:
You can add themes from highlight.js by copying the CSS to a new tiddler and tagging it with [[$:/tags/Stylesheet]]. The available themes can be found on GitHub:

https://github.com/isagalaev/highlight.js/tree/master/src/styles
2 changes: 1 addition & 1 deletion editions/tw5.com/tiddlers/concepts/SystemTags.tid
Expand Up @@ -31,7 +31,7 @@ These are the available system tags
* {{$:/tags/Palette||$:/core/ui/TagTemplate}} for colour palettes
* {{$:/tags/RawMarkup||$:/core/ui/TagTemplate}} for raw markup to be included in the generated HTML file
* {{$:/tags/SideBar||$:/core/ui/TagTemplate}} for sidebar tabs
* {{$:/tags/stylesheet||$:/core/ui/TagTemplate}} to indicate that a tiddler should be applied as a CSS stylesheet
* {{$:/tags/Stylesheet||$:/core/ui/TagTemplate}} to indicate that a tiddler should be applied as a CSS stylesheet
* {{$:/tags/TiddlerInfo||$:/core/ui/TagTemplate}} for tiddler info panel tabs
* {{$:/tags/TiddlerInfo/Advanced||$:/core/ui/TagTemplate}} for tabs under the advanced tiddler tab
* {{$:/tags/TopLeftBar||$:/core/ui/TagTemplate}} for the top left bar
Expand Down
Expand Up @@ -20,7 +20,7 @@ The system tiddlers provided as part of the core are named according to the foll
|`$:/plugins/*` |lowercase |Plugin tiddlers, and plugin content |
|`$:/snippets/*` |//inconsistent// |Reusable snippets (will be replaced by macros) |
|`$:/state/*` |lowercase |User interface state tiddlers |
|`$:/tags/*` |~CamelCase |User interface configuration tags (currently `$:/tags/stylesheet` is inconsistent) |
|`$:/tags/*` |~CamelCase |User interface configuration tags |
|`$:/temp/*` |lowercase |Temporary tiddlers that shouldn't be saved |
|`$:/themes/*` |lowercase |Theme plugins |

Expand Down
2 changes: 1 addition & 1 deletion editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid
Expand Up @@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki

The usual way of modifying the appearance of a TiddlyWiki is to use one of the available themes, or to modify the [[colour palette|ColourPalettes]].

You can also use custom CSS stylesheets by tagging tiddlers with `$:/tags/stylesheet`. For example, create a tiddler with the tag `$:/tags/stylesheet` and the following content in order to change the page background colour to red:
You can also use custom CSS stylesheets by tagging tiddlers with `$:/tags/Stylesheet`. For example, create a tiddler with the tag `$:/tags/Stylesheet` and the following content in order to change the page background colour to red:

```
html body.tc-body {
Expand Down
2 changes: 1 addition & 1 deletion editions/tw5.com/tiddlers/system/tw5.com-styles.tid
@@ -1,5 +1,5 @@
title: $:/_tw5.com-styles
tags: $:/tags/stylesheet
tags: $:/tags/Stylesheet

@media (min-width: 600px) {

Expand Down
4 changes: 2 additions & 2 deletions plugins/tiddlywiki/codemirror/files/tiddlywiki.files
Expand Up @@ -12,14 +12,14 @@
"fields": {
"type": "text/css",
"title": "$:/plugins/tiddlywiki/codemirror/lib/codemirror.css",
"tags": "[[$:/tags/stylesheet]]"
"tags": "[[$:/tags/Stylesheet]]"
}
},{
"file": "addon/dialog/dialog.css",
"fields": {
"type": "text/css",
"title": "$:/plugins/tiddlywiki/codemirror/addon/dialog/dialog.css",
"tags": "[[$:/tags/stylesheet]]"
"tags": "[[$:/tags/Stylesheet]]"
}
},{
"file": "addon/dialog/dialog.js",
Expand Down
2 changes: 1 addition & 1 deletion plugins/tiddlywiki/codemirror/styles.tid
@@ -1,5 +1,5 @@
title: $:/plugins/tiddlywiki/codemirror/styles
tags: [[$:/tags/stylesheet]]
tags: [[$:/tags/Stylesheet]]

/* Make the editor resize to fit its content */

Expand Down
2 changes: 1 addition & 1 deletion plugins/tiddlywiki/d3/base.tid
@@ -1,5 +1,5 @@
title: $:/plugins/tiddlywiki/d3/base.tid
tags: [[$:/tags/stylesheet]]
tags: [[$:/tags/Stylesheet]]

\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline

Expand Down
2 changes: 1 addition & 1 deletion plugins/tiddlywiki/github-fork-ribbon/styles.tid
@@ -1,5 +1,5 @@
title: $:/plugins/tiddlywiki/github-fork-ribbon/styles
tags: [[$:/tags/stylesheet]]
tags: [[$:/tags/Stylesheet]]

/* Left will inherit from right (so we don't need to duplicate code */
.github-fork-ribbon {
Expand Down
2 changes: 1 addition & 1 deletion plugins/tiddlywiki/highlight/files/tiddlywiki.files
Expand Up @@ -15,7 +15,7 @@
"fields": {
"type": "text/css",
"title": "$:/plugins/tiddlywiki/highlight/highlight.css",
"tags": "[[$:/tags/stylesheet]]"
"tags": "[[$:/tags/Stylesheet]]"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion plugins/tiddlywiki/highlight/styles.tid
@@ -1,5 +1,5 @@
title: $:/plugins/tiddlywiki/highlight/styles
tags: [[$:/tags/stylesheet]]
tags: [[$:/tags/Stylesheet]]


/* Tomorrow Night Theme */
Expand Down
2 changes: 1 addition & 1 deletion plugins/tiddlywiki/jasmine/files/tiddlywiki.files
Expand Up @@ -13,7 +13,7 @@
"fields": {
"type": "text/css",
"title": "$:/plugins/tiddlywiki/jasmine/jasmine.css",
"tags": "[[$:/tags/stylesheet]]"
"tags": "[[$:/tags/Stylesheet]]"
}
},{
"file": "jasmine.js",
Expand Down
2 changes: 1 addition & 1 deletion plugins/tiddlywiki/tw2parser/image-css.tid
@@ -1,4 +1,4 @@
tags: $:/tags/stylesheet
tags: $:/tags/Stylesheet
title: $:/plugins/tiddlywiki/tw2parser/image-css
type: text/plain

Expand Down
2 changes: 1 addition & 1 deletion plugins/tiddlywiki/upgrade/styles.tid
@@ -1,5 +1,5 @@
title: $:/plugins/tiddlywiki/upgrade/styles
tags: $:/tags/stylesheet
tags: $:/tags/Stylesheet

.tc-upgrade-wizard-wrapper {
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion themes/tiddlywiki/centralised/styles.tid
@@ -1,5 +1,5 @@
title: $:/themes/tiddlywiki/centralised/styles.tid
tags: [[$:/tags/stylesheet]]
tags: [[$:/tags/Stylesheet]]

\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline

Expand Down
2 changes: 1 addition & 1 deletion themes/tiddlywiki/readonly/styles.tid
@@ -1,5 +1,5 @@
title: $:/themes/tiddlywiki/readonly/styles.tid
tags: [[$:/tags/stylesheet]]
tags: [[$:/tags/Stylesheet]]

\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline

Expand Down
2 changes: 1 addition & 1 deletion themes/tiddlywiki/seamless/base.tid
@@ -1,5 +1,5 @@
title: $:/themes/tiddlywiki/seamless/base
tags: [[$:/tags/stylesheet]]
tags: [[$:/tags/Stylesheet]]
list-after: $:/themes/tiddlywiki/vanilla/base

\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
Expand Down
2 changes: 1 addition & 1 deletion themes/tiddlywiki/snowwhite/base.tid
@@ -1,5 +1,5 @@
title: $:/themes/tiddlywiki/snowwhite/base
tags: [[$:/tags/stylesheet]]
tags: [[$:/tags/Stylesheet]]

\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline

Expand Down
2 changes: 1 addition & 1 deletion themes/tiddlywiki/starlight/styles.tid
@@ -1,5 +1,5 @@
title: $:/themes/tiddlywiki/starlight/styles.tid
tags: [[$:/tags/stylesheet]]
tags: [[$:/tags/Stylesheet]]

\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline

Expand Down
2 changes: 1 addition & 1 deletion themes/tiddlywiki/stickytitles/styles.tid
@@ -1,5 +1,5 @@
title: $:/themes/tiddlywiki/stickytitles/styles.tid
tags: [[$:/tags/stylesheet]]
tags: [[$:/tags/Stylesheet]]

\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline

Expand Down
2 changes: 1 addition & 1 deletion themes/tiddlywiki/vanilla/base.tid
@@ -1,5 +1,5 @@
title: $:/themes/tiddlywiki/vanilla/base
tags: [[$:/tags/stylesheet]]
tags: [[$:/tags/Stylesheet]]

\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
/*
Expand Down

0 comments on commit f6ff0a7

Please sign in to comment.