diff --git a/core/modules/widgets/keyboard.js b/core/modules/widgets/keyboard.js index 6ec9b4a04..c30649f86 100644 --- a/core/modules/widgets/keyboard.js +++ b/core/modules/widgets/keyboard.js @@ -37,7 +37,7 @@ KeyboardWidget.prototype.render = function(parent,nextSibling) { var domNode = this.document.createElement("div"); // Assign classes var classes = (this["class"] || "").split(" "); - classes.push("tw-keyboard"); + classes.push("tc-keyboard"); domNode.className = classes.join(" "); // Add a keyboard event handler domNode.addEventListener("keydown",function (event) { diff --git a/core/modules/widgets/link.js b/core/modules/widgets/link.js index c1bda8a91..a13dbc7d8 100755 --- a/core/modules/widgets/link.js +++ b/core/modules/widgets/link.js @@ -129,15 +129,15 @@ LinkWidget.prototype.handleDragStartEvent = function(event) { $tw.utils.addClass(event.target,"tc-tiddlylink-dragging"); // Create the drag image elements this.dragImage = this.document.createElement("div"); - this.dragImage.className = "tw-tiddler-dragger"; + this.dragImage.className = "tc-tiddler-dragger"; var inner = this.document.createElement("div"); - inner.className = "tw-tiddler-dragger-inner"; + inner.className = "tc-tiddler-dragger-inner"; inner.appendChild(this.document.createTextNode(this.to)); this.dragImage.appendChild(inner); this.document.body.appendChild(this.dragImage); // Astoundingly, we need to cover the dragger up: http://www.kryogenix.org/code/browser/custom-drag-image.html var cover = this.document.createElement("div"); - cover.className = "tw-tiddler-dragger-cover"; + cover.className = "tc-tiddler-dragger-cover"; cover.style.left = (inner.offsetLeft - 16) + "px"; cover.style.top = (inner.offsetTop - 16) + "px"; cover.style.width = (inner.offsetWidth + 32) + "px"; diff --git a/core/modules/widgets/radio.js b/core/modules/widgets/radio.js index 6b60f3943..dc14046a1 100644 --- a/core/modules/widgets/radio.js +++ b/core/modules/widgets/radio.js @@ -101,7 +101,7 @@ RadioWidget.prototype.execute = function() { if(this.radioClass !== "") { this.radioClass += " "; } - this.radioClass += "tw-radio"; + this.radioClass += "tc-radio"; // Make the child widgets this.makeChildWidgets(); }; diff --git a/core/modules/widgets/reveal.js b/core/modules/widgets/reveal.js index e38ff135c..b2229631a 100755 --- a/core/modules/widgets/reveal.js +++ b/core/modules/widgets/reveal.js @@ -32,7 +32,7 @@ RevealWidget.prototype.render = function(parent,nextSibling) { this.execute(); var domNode = this.document.createElement(this.parseTreeNode.isBlock ? "div" : "span"); var classes = this["class"].split(" ") || []; - classes.push("tw-reveal"); + classes.push("tc-reveal"); domNode.className = classes.join(" "); parent.insertBefore(domNode,nextSibling); this.renderChildren(domNode,null); diff --git a/core/modules/widgets/tiddler.js b/core/modules/widgets/tiddler.js index 0a49a4155..2cfeb4f34 100755 --- a/core/modules/widgets/tiddler.js +++ b/core/modules/widgets/tiddler.js @@ -41,9 +41,9 @@ TiddlerWidget.prototype.execute = function() { this.tiddlerTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler")); // Set context variables this.setVariable("currentTiddler",this.tiddlerTitle); - this.setVariable("missingTiddlerClass",(this.wiki.tiddlerExists(this.tiddlerTitle) || this.wiki.isShadowTiddler(this.tiddlerTitle)) ? "tw-tiddler-exists" : "tw-tiddler-missing"); - this.setVariable("shadowTiddlerClass",this.wiki.isShadowTiddler(this.tiddlerTitle) ? "tw-tiddler-shadow" : ""); - this.setVariable("systemTiddlerClass",this.wiki.isSystemTiddler(this.tiddlerTitle) ? "tw-tiddler-system" : ""); + this.setVariable("missingTiddlerClass",(this.wiki.tiddlerExists(this.tiddlerTitle) || this.wiki.isShadowTiddler(this.tiddlerTitle)) ? "tc-tiddler-exists" : "tc-tiddler-missing"); + this.setVariable("shadowTiddlerClass",this.wiki.isShadowTiddler(this.tiddlerTitle) ? "tc-tiddler-shadow" : ""); + this.setVariable("systemTiddlerClass",this.wiki.isSystemTiddler(this.tiddlerTitle) ? "tc-tiddler-system" : ""); this.setVariable("tiddlerTagClasses",this.getTagClasses()) // Construct the child widgets this.makeChildWidgets(); diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid index 1ba74c687..a89a44c15 100644 --- a/core/ui/EditTemplate.tid +++ b/core/ui/EditTemplate.tid @@ -1,7 +1,7 @@ title: $:/core/ui/EditTemplate \define frame-classes() -tw-tiddler-frame tw-tiddler-edit-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$ +tc-tiddler-frame tc-tiddler-edit-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$ \end
>> <$set name="storyTiddler" value=<>> diff --git a/core/ui/EditTemplate/body.tid b/core/ui/EditTemplate/body.tid index 5637c2f52..1a234e93c 100644 --- a/core/ui/EditTemplate/body.tid +++ b/core/ui/EditTemplate/body.tid @@ -22,14 +22,14 @@ tags: $:/tags/EditTemplate <> <$button type="set" set="$:/state/showeditpreview" setTo="no"><> -
-
+
+
<$transclude />
-
+
<$edit field="text" class="tc-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/>
diff --git a/core/ui/EditTemplate/controls.tid b/core/ui/EditTemplate/controls.tid index 98247ff17..4369d34ef 100644 --- a/core/ui/EditTemplate/controls.tid +++ b/core/ui/EditTemplate/controls.tid @@ -4,8 +4,8 @@ tags: $:/tags/EditTemplate \define config-title() $:/config/EditToolbarButtons/Visibility/$(listItem)$ \end -
+
<$view field="title"/> -<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<> text="hide"><$transclude tiddler=<>/> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<> text="hide"><$transclude tiddler=<>/>
diff --git a/core/ui/MissingTemplate.tid b/core/ui/MissingTemplate.tid index b0c32d6f1..04256507a 100644 --- a/core/ui/MissingTemplate.tid +++ b/core/ui/MissingTemplate.tid @@ -1,6 +1,6 @@ title: $:/core/ui/MissingTemplate -
+
<$button popup=<> class="tc-btn-invisible tw-missing-tiddler-label"> <$view field="title" format="text" /> diff --git a/core/ui/ViewTemplate.tid b/core/ui/ViewTemplate.tid index baf83bb4d..7d6bc230b 100644 --- a/core/ui/ViewTemplate.tid +++ b/core/ui/ViewTemplate.tid @@ -1,7 +1,7 @@ title: $:/core/ui/ViewTemplate \define frame-classes() -tw-tiddler-frame tw-tiddler-view-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$ $(tiddlerTagClasses)$ +tc-tiddler-frame tc-tiddler-view-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$ $(tiddlerTagClasses)$ \end <$set name="storyTiddler" value=<>><$set name="tiddlerInfoState" value=<>><$tiddler tiddler=<>>
>><$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem"><$transclude tiddler=<>/>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid index 8e06fceba..3222e4ac3 100644 --- a/core/ui/ViewTemplate/title.tid +++ b/core/ui/ViewTemplate/title.tid @@ -7,9 +7,9 @@ fill:$(foregroundColor)$; \define config-title() $:/config/ViewToolbarButtons/Visibility/$(listItem)$ \end -
+

- + <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<> text="hide"><$transclude tiddler=<>/> <$set name="foregroundColor" value={{!!color}}> @@ -29,7 +29,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$

-<$reveal type="nomatch" text="" default="" state=<> class="tw-tiddler-info tc-popup" animate="yes" retain="yes"> +<$reveal type="nomatch" text="" default="" state=<> class="tc-tiddler-info tc-popup" animate="yes" retain="yes"> <$transclude tiddler="$:/core/ui/TiddlerInfo"/> diff --git a/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid b/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid index 40105cf9d..02638450d 100644 --- a/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid @@ -18,9 +18,9 @@ The TiddlerWidget sets the CurrentTiddler that applies for processing its conten The tiddler widget assigns several useful CSS classes to variables that it creates: -* ''missingTiddlerClass'': ''"tw-tiddler-exists"'' or ''"tw-tiddler-missing"'' depending upon whether the target tiddler exists -* ''shadowTiddlerClass'': ''"tw-tiddler-shadow"'' if the tiddler is a shadow tiddler -* ''systemTiddlerClass'': ''"tw-tiddler-system"'' if the tiddler is a system tiddler +* ''missingTiddlerClass'': ''"tc-tiddler-exists"'' or ''"tc-tiddler-missing"'' depending upon whether the target tiddler exists +* ''shadowTiddlerClass'': ''"tc-tiddler-shadow"'' if the tiddler is a shadow tiddler +* ''systemTiddlerClass'': ''"tc-tiddler-system"'' if the tiddler is a system tiddler * ''tiddlerTagClasses'': A space separated list of CSS classes named ''"tw-tagged-{tagname}"''. For example ''"tw-tagged-introduction"''. Note that tag names are UrlEncoded which means that the tag ''$:/tags/Macro'' appears as the CSS class ''"tw-tagged-%24%3A%2Ftags%2FMacro"'' You can use these variables like this: diff --git a/editions/tw5.com/tiddlers/wikitext/Styles and Classes in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Styles and Classes in WikiText.tid index 6d6fec66e..e89735950 100644 --- a/editions/tw5.com/tiddlers/wikitext/Styles and Classes in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Styles and Classes in WikiText.tid @@ -22,7 +22,7 @@ Similar syntax is used to assign styles. For example: Multiple styles and classes can be mixed. For example: -<> } -.tw-tiddler-controls button.tw-selected svg { +.tc-tiddler-controls button.tw-selected svg { <> } @@ -62,7 +62,7 @@ Seamless modifications @media (min-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) { /* Drop the tiddler frame padding */ - body.tw-body .tw-tiddler-frame { + body.tw-body .tc-tiddler-frame { padding: 0; } @@ -72,7 +72,7 @@ Seamless modifications } /* Stop the tiddler info panel from bleeding into the tiddler frame padding */ - body.tw-body .tw-tiddler-info { + body.tw-body .tc-tiddler-info { margin: 0; } diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid index 8280fcf3f..fb205812e 100644 --- a/themes/tiddlywiki/snowwhite/base.tid +++ b/themes/tiddlywiki/snowwhite/base.tid @@ -7,31 +7,31 @@ tags: [[$:/tags/stylesheet]] text-shadow: 0 1px 0 <>; } -.tw-tiddler-info { +.tc-tiddler-info { <> } @media screen { - .tw-tiddler-frame { + .tc-tiddler-frame { <> } } @media (max-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) { - .tw-tiddler-frame { + .tc-tiddler-frame { <> } } -.tw-page-controls button svg, .tw-tiddler-controls button svg, .tw-topbar button svg { +.tw-page-controls button svg, .tc-tiddler-controls button svg, .tw-topbar button svg { <> } -.tw-tiddler-controls button.tw-selected svg { +.tc-tiddler-controls button.tw-selected svg { <> } -.tw-tiddler-frame input.tc-edit-texteditor { +.tc-tiddler-frame input.tc-edit-texteditor { <> } @@ -39,7 +39,7 @@ tags: [[$:/tags/stylesheet]] <> } -.tw-tiddler-frame .tc-edit-tags input.tc-edit-texteditor { +.tc-tiddler-frame .tc-edit-tags input.tc-edit-texteditor { <> border: none; outline: none; diff --git a/themes/tiddlywiki/stickytitles/styles.tid b/themes/tiddlywiki/stickytitles/styles.tid index b687fc8f9..48c2ac674 100644 --- a/themes/tiddlywiki/stickytitles/styles.tid +++ b/themes/tiddlywiki/stickytitles/styles.tid @@ -3,7 +3,7 @@ tags: [[$:/tags/stylesheet]] \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline -.tw-tiddler-title { +.tc-tiddler-title { position: -webkit-sticky; position: -moz-sticky; position: -o-sticky; diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 415e6ddf6..4b74f7ade 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -121,16 +121,16 @@ table tfoot tr td { white-space: nowrap; } -.tw-tiddler-frame img, -.tw-tiddler-frame svg, -.tw-tiddler-frame canvas, -.tw-tiddler-frame embed, -.tw-tiddler-frame iframe { +.tc-tiddler-frame img, +.tc-tiddler-frame svg, +.tc-tiddler-frame canvas, +.tc-tiddler-frame embed, +.tc-tiddler-frame iframe { max-width: 100%; } -.tw-tiddler-frame embed, -.tw-tiddler-frame iframe { +.tc-tiddler-frame embed, +.tc-tiddler-frame iframe { width: 100%; height: 600px; } @@ -193,12 +193,12 @@ a.tc-tiddlylink-external:hover { ** Drag and drop styles */ -.tw-tiddler-dragger { +.tc-tiddler-dragger { position: relative; z-index: -10000; } -.tw-tiddler-dragger-inner { +.tc-tiddler-dragger-inner { position: absolute; display: inline-block; padding: 8px 20px; @@ -213,7 +213,7 @@ a.tc-tiddlylink-external:hover { border-radius: 20px; } -.tw-tiddler-dragger-cover { +.tc-tiddler-dragger-cover { position: absolute; background-color: <>; } @@ -516,7 +516,7 @@ button.tw-tag-label, span.tw-tag-label { padding: 0; } - .tc-story-river .tw-tiddler-frame { + .tc-story-river .tc-tiddler-frame { margin: 0; border: none; padding: 28px; @@ -527,25 +527,25 @@ button.tw-tag-label, span.tw-tag-label { ** Tiddler styles */ -.tw-tiddler-frame { +.tc-tiddler-frame { margin-bottom: 28px; background-color: <>; border: 1px solid <>; } -.tw-tiddler-info { +.tc-tiddler-info { padding: 14px 42px 14px 42px; background-color: <>; border-top: 1px solid <>; border-bottom: 1px solid <>; } -.tw-tiddler-info p { +.tc-tiddler-info p { margin-top: 3px; margin-bottom: 3px; } -.tw-tiddler-info .tw-tab-buttons button.tw-tab-selected { +.tc-tiddler-info .tw-tab-buttons button.tw-tab-selected { background-color: <>; border-bottom: 1px solid <>; } @@ -565,30 +565,30 @@ button.tw-tag-label, span.tw-tag-label { } @media (max-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) { - .tw-tiddler-frame { + .tc-tiddler-frame { padding: 14px 14px 14px 14px; } - .tw-tiddler-info { + .tc-tiddler-info { margin: 0 -14px 0 -14px; } } @media (min-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) { - .tw-tiddler-frame { + .tc-tiddler-frame { padding: 28px 42px 42px 42px; width: {{$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth}}; } <> - .tw-tiddler-info { + .tc-tiddler-info { margin: 0 -42px 0 -42px; } } @@ -616,52 +616,52 @@ button.tw-tag-label, span.tw-tag-label { font-weight: 300; } -.tw-tiddler-missing .tc-title { +.tc-tiddler-missing .tc-title { font-style: italic; font-weight: normal; } -.tw-tiddler-frame .tw-tiddler-controls { +.tc-tiddler-frame .tc-tiddler-controls { float: right; } -.tw-tiddler-controls .tc-drop-down { +.tc-tiddler-controls .tc-drop-down { font-size: 0.6em; } -.tw-tiddler-controls button { +.tc-tiddler-controls button { vertical-align: baseline; } -.tw-tiddler-controls button svg, .tw-tiddler-controls button img { +.tc-tiddler-controls button svg, .tc-tiddler-controls button img { height: 0.75em; fill: <>; } -.tw-tiddler-controls button.tw-selected svg { +.tc-tiddler-controls button.tw-selected svg { fill: <>; } -.tw-tiddler-controls button.tc-btn-invisible:hover svg { +.tc-tiddler-controls button.tc-btn-invisible:hover svg { fill: <>; } @media print { - .tw-tiddler-controls { + .tc-tiddler-controls { display: none; } } -.tw-tiddler-help { /* Help prompts within tiddler template */ +.tc-tiddler-help { /* Help prompts within tiddler template */ color: <>; margin-top: 14px; } -.tw-tiddler-help a.tc-tiddlylink { +.tc-tiddler-help a.tc-tiddlylink { color: <>; } -.tw-tiddler-frame input.tc-edit-texteditor, .tw-tiddler-frame textarea.tc-edit-texteditor { +.tc-tiddler-frame input.tc-edit-texteditor, .tc-tiddler-frame textarea.tc-edit-texteditor { width: 100%; padding: 3px 3px 3px 3px; border: 1px solid <>; @@ -670,7 +670,7 @@ button.tw-tag-label, span.tw-tag-label { margin: 4px 0 4px 0; } -.tw-tiddler-frame .tw-binary-warning { +.tc-tiddler-frame .tw-binary-warning { width: 100%; height: 5em; text-align: center; @@ -679,7 +679,7 @@ button.tw-tag-label, span.tw-tag-label { border: 1px solid <>; } -.tw-tiddler-frame input.tc-edit-texteditor { +.tc-tiddler-frame input.tc-edit-texteditor { background-color: <>; } @@ -717,27 +717,27 @@ canvas.tc-edit-bitmapeditor { fill: <>; } -.tw-tiddler-controls button svg.tc-image-info-button { +.tc-tiddler-controls button svg.tc-image-info-button { fill: <>; } -.tw-tiddler-controls button svg.tc-image-edit-button { +.tc-tiddler-controls button svg.tc-image-edit-button { fill: <>; } -.tw-tiddler-controls button svg.tc-image-close-button { +.tc-tiddler-controls button svg.tc-image-close-button { fill: <>; } -.tw-tiddler-controls button svg.tc-image-delete-button { +.tc-tiddler-controls button svg.tc-image-delete-button { fill: <>; } -.tw-tiddler-controls button svg.tc-image-cancel-button { +.tc-tiddler-controls button svg.tc-image-cancel-button { fill: <>; } -.tw-tiddler-controls button svg.tc-image-done-button { +.tc-tiddler-controls button svg.tc-image-done-button { fill: <>; } @@ -745,7 +745,7 @@ canvas.tc-edit-bitmapeditor { ** Tiddler edit mode */ -.tw-tiddler-edit-frame em.tc-edit { +.tc-tiddler-edit-frame em.tc-edit { color: <>; font-style: normal; } @@ -784,11 +784,11 @@ canvas.tc-edit-bitmapeditor { padding-left: 4px; } -.tw-tiddler-preview { +.tc-tiddler-preview { overflow: auto; } -.tw-tiddler-preview-preview { +.tc-tiddler-preview-preview { float: right; width: 48%; border: 1px solid <>; @@ -796,7 +796,7 @@ canvas.tc-edit-bitmapeditor { padding: 3px 3px 3px 3px; } -.tw-tiddler-preview-edit { +.tc-tiddler-preview-edit { width: 48%; }