From 30d0dec1fa0cea5efeeea8f55cff815748d10d31 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sun, 3 Feb 2013 23:02:23 +0000 Subject: [PATCH] Replacement styles Smaller simpler styles (including CSS reset from https://github.com/necolas/normalize.css/) --- core/modules/startup.js | 4 +- core/modules/widgets/transclude.js | 2 +- core/styles/base.tid | 133 ++++++ core/styles/boot.css.tid | 40 ++ core/styles/colourmappings.tid | 9 + core/styles/colours.tid | 7 + core/styles/metrics.tid | 5 + core/styles/reset.tid | 399 ++++++++++++++++++ core/templates/PageTemplate.tid | 46 +- core/templates/TagTemplate.tid | 18 +- core/templates/ViewTemplate.tid | 6 +- ..._started_with_TiddlyWiki_under_node.js.tid | 11 +- 12 files changed, 634 insertions(+), 46 deletions(-) create mode 100644 core/styles/base.tid create mode 100644 core/styles/boot.css.tid create mode 100644 core/styles/colourmappings.tid create mode 100644 core/styles/colours.tid create mode 100644 core/styles/metrics.tid create mode 100644 core/styles/reset.tid diff --git a/core/modules/startup.js b/core/modules/startup.js index e1009d7ae..0bede0478 100644 --- a/core/modules/startup.js +++ b/core/modules/startup.js @@ -106,7 +106,9 @@ exports.startup = function() { renderTree.execute({tiddlerTitle: title}); var styleNode = document.createElement("style"); styleNode.type = "text/css"; - styleNode.appendChild(document.createTextNode(renderTree.render("text/plain"))); + var text = renderTree.render("text/plain"); + console.log(text) + styleNode.appendChild(document.createTextNode(text)); document.getElementsByTagName("head")[0].appendChild(styleNode); }); // If we're being viewed on a data: URI then give instructions for how to save diff --git a/core/modules/widgets/transclude.js b/core/modules/widgets/transclude.js index 0a9a973be..81fe70c00 100644 --- a/core/modules/widgets/transclude.js +++ b/core/modules/widgets/transclude.js @@ -87,7 +87,7 @@ TranscludeWidget.prototype.generate = function() { parser = this.renderer.renderTree.wiki.parseText("text/vnd.tiddlywiki",text,{parseAsInline: !this.renderer.parseTreeNode.isBlock}); } else if(this.targetIndex) { text = this.renderer.renderTree.wiki.extractTiddlerDataItem(this.targetTitle,this.targetIndex,""); - parser = this.renderer.renderTree.wiki.parseText("text/plain",text); + parser = this.renderer.renderTree.wiki.parseText("text/vnd.tiddlywiki",text); } } templateParseTree = parser ? parser.tree : []; diff --git a/core/styles/base.tid b/core/styles/base.tid new file mode 100644 index 000000000..5767582da --- /dev/null +++ b/core/styles/base.tid @@ -0,0 +1,133 @@ +title: $:/core/styles/base +tags: $:/core/styles + +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline +\define border-radius(radius) +``` + -webkit-border-radius: $radius$; + -moz-border-radius: $radius$; + border-radius: $radius$; +``` +\end +\define box-shadow(shadow) +``` + -webkit-box-shadow: $shadow$; + -moz-box-shadow: $shadow$; + box-shadow: $shadow$; +``` +\end + +{{$:/core/styles/reset}} + +body { + font-size: {{$:/core/styles/metrics##fontsize}}; + line-height: {{$:/core/styles/metrics##lineheight}}; + background-color: {{$:/core/styles/colourmappings##pagebackground}} +} + +a.tw-tiddlylink { + text-decoration: none; + font-style: normal; + font-weight: normal; + color: {{$:/core/styles/colourmappings##linkforeground}}; +} + +a.tw-tiddlylink:hover { + color: {{$:/core/styles/colourmappings##linkbackground}}; + background-color: {{$:/core/styles/colourmappings##linkforeground}}; +} + +a.tw-tiddlylink-resolves { + font-style: normal; + font-weight: bold; +} + +a.tw-tiddlylink-missing { + font-style: italic; +} + +.btn-invisible { + padding: 0; + margin: 0; + background: none; + border: none; +} + +.label { + display: inline-block; + padding: 2px 4px; + font-size: 11.844px; + font-weight: bold; + line-height: 14px; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + white-space: nowrap; + vertical-align: baseline; + background-color: #999999; + <> +} + +.edit-header { + padding: 1em; + background-color: #000; + color: #fff; +} + +.sidebar-header { + position: fixed; + top: 0; + left: 0; + bottom: 0; + width: 10em; + overflow-y: auto; + overflow-x: auto; + padding: 1em; +} + +.story-river { + margin-left: 10em; + padding: 2em; +} + +.tw-tiddler-frame { + padding: 2em; + margin-bottom: 2em; + background-color: {{$:/core/styles/colourmappings##tiddlerbackground}}; + max-width: 40em; +} + +.tw-tiddler-frame .title { + font-weight: bold; + font-size: 33px; + line-height: 40px; + color: #182955; +} + +.tw-tiddler-missing .title { + font-style: italic; + font-weight: normal; +} + +.tw-tiddler-frame .tw-tiddler-controls { + float: right; +} + +.tw-drop-down { + display: block; + position: absolute; + border: 1px solid {{$:/core/styles/colourmappings##dropdownborder}}; + background-color: {{$:/core/styles/colourmappings##dropdownbackground}}; + <> + <> + padding: 0.5em 0em 0.5em 0em; +} + +.tw-drop-down a { + display: block; + padding: 0em 1em 0em 1em; +} + +.tw-edit-texteditor input, .tw-edit-texteditor textarea { + width: 100%; +} + diff --git a/core/styles/boot.css.tid b/core/styles/boot.css.tid new file mode 100644 index 000000000..c54df5441 --- /dev/null +++ b/core/styles/boot.css.tid @@ -0,0 +1,40 @@ +title: $:/core/styles/boot.css +type: text/css + +/* +Basic styles used before we boot up the parsing engine +*/ +html { + font-family: sans-serif; +} + +/* +Password prompts +*/ +.tw-password-wrapper { + z-index: 20000; + position: fixed; + text-align: center; + width: 480px; + top: 4em; + left: 50%; + margin-left: -264px; /* - width/2 - paddingHorz/2 - border */ + padding: 16px 16px 16px 16px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + color: #000; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + background-color: rgb(197, 235, 183); + border: 8px solid rgb(164, 197, 152); +} + +.tw-password-wrapper form { + text-align: left; +} + +.tw-password-wrapper h1 { + font-size: 16px; + line-height: 20px; +} + diff --git a/core/styles/colourmappings.tid b/core/styles/colourmappings.tid new file mode 100644 index 000000000..a95419e0b --- /dev/null +++ b/core/styles/colourmappings.tid @@ -0,0 +1,9 @@ +title: $:/core/styles/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}} diff --git a/core/styles/colours.tid b/core/styles/colours.tid new file mode 100644 index 000000000..39d27ceb7 --- /dev/null +++ b/core/styles/colours.tid @@ -0,0 +1,7 @@ +title: $:/core/styles/colours +type: application/x-tiddler-dictionary + +primary: `#65d` +background: `#fff` +pagebackground: `#ececec` +medium: `#888` \ No newline at end of file diff --git a/core/styles/metrics.tid b/core/styles/metrics.tid new file mode 100644 index 000000000..8eb535f5f --- /dev/null +++ b/core/styles/metrics.tid @@ -0,0 +1,5 @@ +title: $:/core/styles/metrics +type: application/x-tiddler-dictionary + +fontsize: `14px` +lineheight: `20px` diff --git a/core/styles/reset.tid b/core/styles/reset.tid new file mode 100644 index 000000000..1ef972c83 --- /dev/null +++ b/core/styles/reset.tid @@ -0,0 +1,399 @@ +title: $:/core/styles/reset +type: text/plain + +/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ + +/* ========================================================================== + HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined in IE 8/9. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +nav, +section, +summary { + display: block; +} + +/** + * Correct `inline-block` display not defined in IE 8/9. + */ + +audio, +canvas, +video { + display: inline-block; +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address styling not present in IE 8/9. + */ + +[hidden] { + display: none; +} + +/* ========================================================================== + Base + ========================================================================== */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ + +html { + font-family: sans-serif; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ + -ms-text-size-adjust: 100%; /* 2 */ +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* ========================================================================== + Links + ========================================================================== */ + +/** + * Address `outline` inconsistency between Chrome and other browsers. + */ + +a:focus { + outline: thin dotted; +} + +/** + * Improve readability when focused and also mouse hovered in all browsers. + */ + +a:active, +a:hover { + outline: 0; +} + +/* ========================================================================== + Typography + ========================================================================== */ + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari 5, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9, Safari 5, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +/** + * Address styling not present in Safari 5 and Chrome. + */ + +dfn { + font-style: italic; +} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +/** + * Address styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + +/** + * Correct font family set oddly in Safari 5 and Chrome. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, serif; + font-size: 1em; +} + +/** + * Improve readability of pre-formatted text in all browsers. + */ + +pre { + white-space: pre-wrap; +} + +/** + * Set consistent quote types. + */ + +q { + quotes: "\201C" "\201D" "\2018" "\2019"; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* ========================================================================== + Embedded content + ========================================================================== */ + +/** + * Remove border when inside `a` element in IE 8/9. + */ + +img { + border: 0; +} + +/** + * Correct overflow displayed oddly in IE 9. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* ========================================================================== + Figures + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari 5. + */ + +figure { + margin: 0; +} + +/* ========================================================================== + Forms + ========================================================================== */ + +/** + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * 1. Correct font family not being inherited in all browsers. + * 2. Correct font size not being inherited in all browsers. + * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. + */ + +button, +input, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 2 */ + margin: 0; /* 3 */ +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +button, +input { + line-height: normal; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. + * Correct `select` style inheritance in Firefox 4+ and Opera. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ +} + +/** + * Re-set default cursor for disabled elements. + */ + +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * 1. Address box sizing set to `content-box` in IE 8/9. + * 2. Remove excess padding in IE 8/9. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome + * (include `-moz` to future-proof). + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; +} + +/** + * Remove inner padding and search cancel button in Safari 5 and Chrome + * on OS X. + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * 1. Remove default vertical scrollbar in IE 8/9. + * 2. Improve readability and alignment in all browsers. + */ + +textarea { + overflow: auto; /* 1 */ + vertical-align: top; /* 2 */ +} + +/* ========================================================================== + Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} diff --git a/core/templates/PageTemplate.tid b/core/templates/PageTemplate.tid index 004ca2312..19a6e6fd6 100644 --- a/core/templates/PageTemplate.tid +++ b/core/templates/PageTemplate.tid @@ -3,32 +3,34 @@ title: $:/templates/PageTemplate <$navigator story="$:/StoryList" history="$:/HistoryList"> - -
-{{$:/snippets/encryptionstatus}} -<$button message="tw-NewTiddler" class="btn btn-mini btn-success">New -<$button message="tw-save-wiki" class="btn btn-mini btn-primary">Save -
-
- ! {{SiteTitle}} {{SiteSubtitle}} -
+ +
- -
-
-
-
- +
+{{SiteTitle}}
{{SiteSubtitle}} +
<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" listview=classic itemClass="tw-menu-list-item"/> -
-
-
- +
+ + +
+ + +
+<$button message="tw-NewTiddler" class="btn btn-mini btn-success">New +<$button message="tw-save-wiki" class="btn btn-mini btn-primary">Save +
+ + + <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" template="$:/templates/ViewTemplate" editTemplate="$:/templates/EditTemplate" listview="scroller" itemClass="tw-tiddler-frame"/> - - - + + +{{$:/snippets/encryptionstatus}} + + +
diff --git a/core/templates/TagTemplate.tid b/core/templates/TagTemplate.tid index fed966802..f1e0a345d 100644 --- a/core/templates/TagTemplate.tid +++ b/core/templates/TagTemplate.tid @@ -1,20 +1,10 @@ title: $:/templates/TagTemplate <$button popup="tagpopup" qualifyTiddlerTitles="yes" class="btn-invisible"><$setstyle name="background-color" value={{!!color}} class="label"><$view field="title" format="text" /> -<$reveal state="tagpopup" type="popup" position="below" qualifyTiddlerTitles="yes" >
- -@@.dropdown-menu - -* <$view field="title" format="link" /> -*.divider -*
-<$list filter="[is[current]tagging[]sort[title]]"> -
  • +<$reveal state="tagpopup" type="popup" position="below" qualifyTiddlerTitles="yes" >
    +<$view field="title" format="link" /> +
    +<$list filter="[is[current]tagging[]sort[title]]"> <$view field="title" format="link" /> -
    • -
    - -@@ -
    diff --git a/core/templates/ViewTemplate.tid b/core/templates/ViewTemplate.tid index ff9b09302..a25dde6c4 100644 --- a/core/templates/ViewTemplate.tid +++ b/core/templates/ViewTemplate.tid @@ -1,9 +1,11 @@ title: $:/templates/ViewTemplate modifier: JeremyRuston + +<$button message="tw-close" class="btn-invisible">{{$:/core/images/close-button.svg}} +<$button message="tw-EditTiddler" class="btn-invisible">{{$:/core/images/edit-button.svg}} + -<$button message="tw-close" class="btn-invisible pull-right">{{$:/core/images/close-button.svg}} -<$button message="tw-EditTiddler" class="btn-invisible pull-right">{{$:/core/images/edit-button.svg}} <$view field="title"/> diff --git a/editions/tw5.com/tiddlers/guides/Getting_started_with_TiddlyWiki_under_node.js.tid b/editions/tw5.com/tiddlers/guides/Getting_started_with_TiddlyWiki_under_node.js.tid index 5155fcdc0..7dedff826 100644 --- a/editions/tw5.com/tiddlers/guides/Getting_started_with_TiddlyWiki_under_node.js.tid +++ b/editions/tw5.com/tiddlers/guides/Getting_started_with_TiddlyWiki_under_node.js.tid @@ -4,22 +4,21 @@ tags: guide TiddlyWiki5 can be used on the command line to perform an extensive set of operations based on tiddlers, TiddlerFiles and TiddlyWikiFiles. For example, this loads the tiddlers from a TiddlyWiki HTML file and then saves one of them in HTML: -{{{ +``` node tiddlywiki.js --verbose --load mywiki.html --savetiddler ReadMe ./readme.html -}}} +``` !!Usage Running `tiddlywiki.js` from the command line boots the TiddlyWiki kernel, loads the core plugins and establishes an empty wiki store. It then sequentially processes the command line arguments from left to right. The arguments are separated with spaces. The commands are identified by the prefix `--`. -{{{ -node tiddlywiki.js [--