From f8b94715491d4b28fda12beea6ce2eebe73e2054 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 28 Aug 2014 19:00:57 +0100 Subject: [PATCH] Rename more `tw-` classes to `tc-` Part of #764 --- core/templates/alltiddlers.template.html.tid | 2 +- core/templates/static.template.html.tid | 2 +- core/templates/static.tiddler.html.tid | 2 +- core/templates/tiddlywiki5.html.tid | 2 +- .../tw5.com/tiddlers/howtos/Using Stylesheets.tid | 6 +++--- themes/tiddlywiki/seamless/base.tid | 14 +++++++------- themes/tiddlywiki/vanilla/base.tid | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/templates/alltiddlers.template.html.tid b/core/templates/alltiddlers.template.html.tid index ba3d7bde2..5484f9240 100644 --- a/core/templates/alltiddlers.template.html.tid +++ b/core/templates/alltiddlers.template.html.tid @@ -19,7 +19,7 @@ type: text/vnd.tiddlywiki-html {{$:/core/ui/PageStylesheet||$:/core/templates/wikified-tiddler}} - + {{$:/StaticBanner||$:/core/templates/html-tiddler}}
{{$:/core/templates/alltiddlers.content||$:/core/templates/html-tiddler}} diff --git a/core/templates/static.template.html.tid b/core/templates/static.template.html.tid index a4da2cda0..65656c1fb 100644 --- a/core/templates/static.template.html.tid +++ b/core/templates/static.template.html.tid @@ -19,7 +19,7 @@ type: text/vnd.tiddlywiki-html {{$:/core/ui/PageStylesheet||$:/core/templates/wikified-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 87cad5387..f388af73c 100644 --- a/core/templates/static.tiddler.html.tid +++ b/core/templates/static.tiddler.html.tid @@ -12,7 +12,7 @@ title: $:/core/templates/static.tiddler.html `{{$:/core/wiki/title}}` - + `{{$:/StaticBanner||$:/core/templates/html-tiddler}}`
`<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> diff --git a/core/templates/tiddlywiki5.html.tid b/core/templates/tiddlywiki5.html.tid index cd4fcf4d2..3f8701f18 100644 --- a/core/templates/tiddlywiki5.html.tid +++ b/core/templates/tiddlywiki5.html.tid @@ -21,7 +21,7 @@ title: $:/core/templates/tiddlywiki5.html {{{ [all[shadows+tiddlers]tag[$:/core/wiki/rawmarkup]] [all[shadows+tiddlers]tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}} - +
{{$:/boot/boot.css||$:/core/templates/css-tiddler}} diff --git a/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid b/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid index ba08a624b..78d674bcf 100644 --- a/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid +++ b/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid @@ -9,14 +9,14 @@ The usual way of modifying the appearance of a TiddlyWiki is to use one of the a 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.tw-body { +html body.tc-body { background: red; } ``` ! Overriding Theme Settings -Note that custom stylesheets are applied independently to the theme stylesheets. This means that it is frequently necessary to use CSS specificity to reliably override settings within the theme. This means ensuring that the CSS rule in your custom stylesheet is more specific than the theme rule that you are overriding. "More specific" generally means using more CSS rules. So, `html body.tw-body` is more specific than `body.tw-body`. +Note that custom stylesheets are applied independently to the theme stylesheets. This means that it is frequently necessary to use CSS specificity to reliably override settings within the theme. This means ensuring that the CSS rule in your custom stylesheet is more specific than the theme rule that you are overriding. "More specific" generally means using more CSS rules. So, `html body.tc-body` is more specific than `body.tc-body`. ! Stylesheet Types @@ -27,7 +27,7 @@ If you wish to use macros and transclusions in your stylesheets you should inste ``` \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline -body.tw-body pre { +body.tc-body pre { <> } ``` diff --git a/themes/tiddlywiki/seamless/base.tid b/themes/tiddlywiki/seamless/base.tid index 38901bef4..904e4f6d1 100644 --- a/themes/tiddlywiki/seamless/base.tid +++ b/themes/tiddlywiki/seamless/base.tid @@ -62,29 +62,29 @@ Seamless modifications @media (min-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) { /* Drop the tiddler frame padding */ - body.tw-body .tc-tiddler-frame { + body.tc-body .tc-tiddler-frame { padding: 0; } /* Move the sidebar up so that the title lines up */ - body.tw-body .tw-sidebar-scrollable { + body.tc-body .tw-sidebar-scrollable { padding: 43px 0 28px 42px; } /* Stop the tiddler info panel from bleeding into the tiddler frame padding */ - body.tw-body .tc-tiddler-info { + body.tc-body .tc-tiddler-info { margin: 0; } /* Stop message boxes from bleeding into the tiddler frame padding */ - body.tw-body .tw-message-box { + body.tc-body .tw-message-box { margin: 21px 0 21px 0; } } /* Use the tiddler background colour for the page background */ -html body.tw-body { +html body.tc-body { background-color: <>; } @@ -93,11 +93,11 @@ html:-webkit-full-screen { } /* Adjust the colour of the page controls */ -body.tw-body .tw-page-controls svg { +body.tc-body .tw-page-controls svg { fill: <>; } /* Adjust the colour of the sidebar selected tabs */ -body.tw-body .tw-sidebar-lists .tw-tab-buttons button.tw-tab-selected { +body.tc-body .tw-sidebar-lists .tw-tab-buttons button.tw-tab-selected { background-color: <>; } diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 4b74f7ade..96d36baad 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -31,7 +31,7 @@ html:-webkit-full-screen { background-color: <>; } -body.tw-body { +body.tc-body { font-size: {{$:/themes/tiddlywiki/vanilla/metrics/fontsize}}; line-height: {{$:/themes/tiddlywiki/vanilla/metrics/lineheight}}; color: <>; @@ -503,7 +503,7 @@ button.tw-tag-label, span.tw-tag-label { @media print { - body.tw-body { + body.tc-body { background-color: transparent; }