mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-27 18:40:28 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Bram Chen 2015-05-03 22:11:49 +08:00
commit be0f82c280
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/startup/windows.js
View File

@ -24,7 +24,7 @@ exports.startup = function() {
var refreshHandler, var refreshHandler,
title = event.param || event.tiddlerTitle, title = event.param || event.tiddlerTitle,
paramObject = event.paramObject || {}, paramObject = event.paramObject || {},
template = paramObject.template || "$:/core/ui/ViewTemplate/body", template = paramObject.template || "$:/core/templates/single.tiddler.window",
width = paramObject.width || "700", width = paramObject.width || "700",
height = paramObject.height || "600"; height = paramObject.height || "600";
// Open the window // Open the window
@ -35,7 +35,7 @@ exports.startup = function() {
return; return;
} }
// Initialise the document // Initialise the document
srcDocument.write("<html><head></head><body class='tc-body'></body></html>"); srcDocument.write("<html><head></head><body class='tc-body tc-single-tiddler-window'></body></html>");
srcDocument.close(); srcDocument.close();
srcDocument.title = title; srcDocument.title = title;
srcWindow.addEventListener("beforeunload",function(event) { srcWindow.addEventListener("beforeunload",function(event) {

32
core/templates/single.tiddler.window.tid Normal file
View File

@ -0,0 +1,32 @@
title: $:/core/templates/single.tiddler.window
<$set name="themeTitle" value={{$:/view}}>
<$set name="tempCurrentTiddler" value=<<currentTiddler>>>
<$set name="currentTiddler" value={{$:/language}}>
<$set name="languageTitle" value={{!!name}}>
<$set name="currentTiddler" value=<<tempCurrentTiddler>>>
<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]">
<$navigator story="$:/StoryList" history="$:/HistoryList">
<$transclude mode="block"/>
</$navigator>
</$importvariables>
</$set>
</$set>
</$set>
</$set>
</$set>

4
themes/tiddlywiki/vanilla/base.tid
View File

@ -66,6 +66,10 @@ body.tc-body {
<<custom-background-datauri>> <<custom-background-datauri>>
} }
body.tc-body.tc-single-tiddler-window {
margin: 1em;
}
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
line-height: 1.2; line-height: 1.2;
font-weight: 300; font-weight: 300;