From 3b0e6102ec4cbfafdfa9c0acdd44b25d66d269e0 Mon Sep 17 00:00:00 2001 From: Astrid Elocson Date: Fri, 27 Feb 2015 12:46:19 +0000 Subject: [PATCH 1/2] Expose code font family in Control Panel --- themes/tiddlywiki/vanilla/ThemeTweaks.tid | 24 ++++++++++++---------- themes/tiddlywiki/vanilla/base.tid | 7 +++++-- themes/tiddlywiki/vanilla/settings.multids | 3 ++- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/themes/tiddlywiki/vanilla/ThemeTweaks.tid b/themes/tiddlywiki/vanilla/ThemeTweaks.tid index cdefe0ccd..ba34d487a 100644 --- a/themes/tiddlywiki/vanilla/ThemeTweaks.tid +++ b/themes/tiddlywiki/vanilla/ThemeTweaks.tid @@ -1,3 +1,4 @@ +created: 20150227124409000 title: $:/themes/tiddlywiki/vanilla/themetweaks tags: $:/tags/ControlPanel/Appearance caption: Theme Tweaks @@ -6,17 +7,18 @@ You can tweak certain aspects of the ''Vanilla'' theme. ! Settings -* [[Font family|$:/themes/tiddlywiki/vanilla/settings/fontfamily]]: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/fontfamily" default="" tag="input"/> +|[[Font family|$:/themes/tiddlywiki/vanilla/settings/fontfamily]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/fontfamily" default="" tag="input"/> | +|[[Code font family|$:/themes/tiddlywiki/vanilla/settings/codefontfamily]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/codefontfamily" default="" tag="input"/> | ! Sizes -* [[Font size|$:/themes/tiddlywiki/vanilla/metrics/fontsize]]: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/fontsize" default="" tag="input"/> -* [[Line height|$:/themes/tiddlywiki/vanilla/metrics/lineheight]]: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/lineheight" default="" tag="input"/> -* [[Font size for tiddler body|$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize]]: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize" default="" tag="input"/> -* [[Line height for tiddler body|$:/themes/tiddlywiki/vanilla/metrics/bodylineheight]]: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight" default="" tag="input"/> -* [[Story left position|$:/themes/tiddlywiki/vanilla/metrics/storyleft]] //(the distance between the left of the screen and the left margin of the story river or tiddler area)//: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyleft" default="" tag="input"/> -* [[Story top position|$:/themes/tiddlywiki/vanilla/metrics/storytop]] //(the distance between the top of the screen and the top margin of the story river or tiddler area)//: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storytop" default="" tag="input"/> -* [[Story right|$:/themes/tiddlywiki/vanilla/metrics/storyright]] //(the distance between the left side of the screen and the left margin of the sidebar area)//: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyright" default="" tag="input"/> -* [[Story width|$:/themes/tiddlywiki/vanilla/metrics/storywidth]] //(the width of the story river or tiddler area)//: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storywidth" default="" tag="input"/> -* [[Tiddler width|$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth]] //(the width of individual tiddlers -- used for zoomin storyview)//: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth" default="" tag="input"/> -* [[Sidebar breakpoint|$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint]] //(the minimum width for the sidebar to be displayed alongside the story river)//: <$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint" default="" tag="input"/> +|[[Font size|$:/themes/tiddlywiki/vanilla/metrics/fontsize]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/fontsize" default="" tag="input"/> | +|[[Line height|$:/themes/tiddlywiki/vanilla/metrics/lineheight]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/lineheight" default="" tag="input"/> | +|[[Font size for tiddler body|$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize" default="" tag="input"/> | +|[[Line height for tiddler body|$:/themes/tiddlywiki/vanilla/metrics/bodylineheight]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight" default="" tag="input"/> | +|[[Story left position|$:/themes/tiddlywiki/vanilla/metrics/storyleft]]
//how far the left margin of the story river
(tiddler area) is from the left of the page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyleft" default="" tag="input"/> | +|[[Story top position|$:/themes/tiddlywiki/vanilla/metrics/storytop]]
//how far the top margin of the story river
is from the top of the page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storytop" default="" tag="input"/> | +|[[Story right|$:/themes/tiddlywiki/vanilla/metrics/storyright]]
//how far the left margin of the sidebar
is from the left of the page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyright" default="" tag="input"/> | +|[[Story width|$:/themes/tiddlywiki/vanilla/metrics/storywidth]]
//the overall width of the story river// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storywidth" default="" tag="input"/> | +|[[Tiddler width|$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth]]
//within the story river//
|^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth" default="" tag="input"/> | +|[[Sidebar breakpoint|$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint]]
//the minimum page width at which the story
river and sidebar will appear side by side// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint" default="" tag="input"/> | diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 4639f3000..a3a441b80 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -1,3 +1,4 @@ +created: 20150227121348000 title: $:/themes/tiddlywiki/vanilla/base tags: [[$:/tags/Stylesheet]] @@ -59,6 +60,7 @@ pre { border: 1px solid <>; padding: 0 3px 2px; border-radius: 3px; + font-family: {{$:/themes/tiddlywiki/vanilla/settings/codefontfamily}}; } code { @@ -68,6 +70,7 @@ code { white-space: pre-wrap; padding: 0 3px 2px; border-radius: 3px; + font-family: {{$:/themes/tiddlywiki/vanilla/settings/codefontfamily}}; } blockquote { @@ -1299,7 +1302,7 @@ canvas.tc-edit-bitmapeditor { } .tc-alert-highlight { - color: <>; + color: <>; } .tc-static-alert { @@ -1355,7 +1358,7 @@ a.tc-tiddlylink.tc-plugin-info:hover svg { .tc-plugin-info-chunk { display: inline-block; - vertical-align: middle; + vertical-align: middle; } a.tc-plugin-info img, a.tc-plugin-info svg { diff --git a/themes/tiddlywiki/vanilla/settings.multids b/themes/tiddlywiki/vanilla/settings.multids index 7ae77dcc6..997b19852 100644 --- a/themes/tiddlywiki/vanilla/settings.multids +++ b/themes/tiddlywiki/vanilla/settings.multids @@ -1,3 +1,4 @@ title: $:/themes/tiddlywiki/vanilla/settings/ -fontfamily: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif +fontfamily: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", "DejaVu Sans", sans-serif +codefontfamily: Monaco, Consolas, "Lucida Console", "DejaVu Sans Mono", monospace \ No newline at end of file From e369bc1eb22e3c7f8b140f528993292c6b7e8adc Mon Sep 17 00:00:00 2001 From: Astrid Elocson Date: Sat, 28 Feb 2015 14:47:38 +0000 Subject: [PATCH 2/2] Remove created field accidentally added --- themes/tiddlywiki/vanilla/ThemeTweaks.tid | 1 - themes/tiddlywiki/vanilla/base.tid | 1 - 2 files changed, 2 deletions(-) diff --git a/themes/tiddlywiki/vanilla/ThemeTweaks.tid b/themes/tiddlywiki/vanilla/ThemeTweaks.tid index ba34d487a..f21700dd5 100644 --- a/themes/tiddlywiki/vanilla/ThemeTweaks.tid +++ b/themes/tiddlywiki/vanilla/ThemeTweaks.tid @@ -1,4 +1,3 @@ -created: 20150227124409000 title: $:/themes/tiddlywiki/vanilla/themetweaks tags: $:/tags/ControlPanel/Appearance caption: Theme Tweaks diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index a3a441b80..6336c9790 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -1,4 +1,3 @@ -created: 20150227121348000 title: $:/themes/tiddlywiki/vanilla/base tags: [[$:/tags/Stylesheet]]