From 35d229015580e97c2304a70244b241a1b4ffc381 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Mon, 4 Feb 2013 20:47:21 +0000
Subject: [PATCH] Style and layout tweaks

---
 core/styles/base.tid            | 33 +++++++++++++++++++++++++++++----
 core/styles/boot.css.tid        |  6 ++----
 core/styles/colours.tid         |  2 +-
 core/styles/metrics.tid         |  2 +-
 core/templates/PageTemplate.tid |  4 +---
 core/templates/ViewTemplate.tid |  2 +-
 6 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/core/styles/base.tid b/core/styles/base.tid
index 27d19f5b2..7a87e36b7 100644
--- a/core/styles/base.tid
+++ b/core/styles/base.tid
@@ -19,6 +19,10 @@ tags: $:/core/styles
 
 {{$:/core/styles/reset}}
 
+html {
+	font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+}
+
 body {
 	font-size: {{$:/core/styles/metrics##fontsize}};
 	line-height: {{$:/core/styles/metrics##lineheight}};
@@ -102,7 +106,8 @@ a.tw-tiddlylink-missing {
 	width: {{$:/core/styles/metrics##sidebarwidth}};
 	overflow-y: auto;
 	overflow-x: auto;
-	padding: 1em;
+	padding: 4em 0em 2em 2em;
+	margin: 0;
 }
 
 .tw-menu-list-item {
@@ -122,7 +127,7 @@ a.tw-tiddlylink-missing {
 	<<box-shadow "5px 5px 5px rgba(0, 0, 0, 0.1)">>
 }
 
-.tw-tiddler-frame .title {
+.title {
 	font-weight: bold;
 	font-size: 33px;
 	line-height: 40px;
@@ -138,6 +143,10 @@ a.tw-tiddlylink-missing {
 	float: right;
 }
 
+.tw-tiddler-controls .tw-button {
+	margin: 0 0 0 0.5em;
+}
+
 .tw-drop-down {
 	display: block;
 	position: absolute;
@@ -145,8 +154,9 @@ a.tw-tiddlylink-missing {
 	border: 1px solid {{$:/core/styles/colourmappings##dropdownborder}};
 	background-color: {{$:/core/styles/colourmappings##dropdownbackground}};
 	<<border-radius 4px>>
-	<<box-shadow "5px 5px 10px rgba(0, 0, 0, 0.2)">>
+	<<box-shadow "2px 2px 10px rgba(0, 0, 0, 0.5)">>
 	padding: 0.5em 0em 0.5em 0em;
+	margin: 0.25em 0 0 0;
 	white-space: nowrap;
 }
 
@@ -156,6 +166,21 @@ a.tw-tiddlylink-missing {
 }
 
 .tw-edit-texteditor input, .tw-edit-texteditor textarea {
-	width: 100%;	
+	width: 100%;
 }
 
+canvas.tw-edit-bitmapeditor  {
+	cursor: crosshair;
+	-moz-user-select: none;
+	-webkit-user-select: none;
+	-ms-user-select: none;
+}
+
+img, canvas, embed {
+	max-width: 100%;
+}
+
+embed {
+	width: 100%;
+	height: 20em;
+}
diff --git a/core/styles/boot.css.tid b/core/styles/boot.css.tid
index c54df5441..960ca905f 100644
--- a/core/styles/boot.css.tid
+++ b/core/styles/boot.css.tid
@@ -4,14 +4,12 @@ type: text/css
 /*
 Basic styles used before we boot up the parsing engine
 */
-html {
-    font-family: sans-serif;
-}
 
 /*
-Password prompts
+Password prompt
 */
 .tw-password-wrapper {
+    font-family: sans-serif;
 	z-index: 20000;
 	position: fixed;
 	text-align: center;
diff --git a/core/styles/colours.tid b/core/styles/colours.tid
index a2d9f26a6..2444c7c5a 100644
--- a/core/styles/colours.tid
+++ b/core/styles/colours.tid
@@ -4,4 +4,4 @@ type: application/x-tiddler-dictionary
 primary: `#6a5ccc`
 background: `#fff`
 pagebackground: `#ececec`
-medium: `#888`
\ No newline at end of file
+medium: `#bbb`
\ No newline at end of file
diff --git a/core/styles/metrics.tid b/core/styles/metrics.tid
index 2028bda25..73fe80a31 100644
--- a/core/styles/metrics.tid
+++ b/core/styles/metrics.tid
@@ -3,4 +3,4 @@ type: application/x-tiddler-dictionary
 
 fontsize: `14px`
 lineheight: `20px`
-sidebarwidth: `17%`
+sidebarwidth: `20%`
diff --git a/core/templates/PageTemplate.tid b/core/templates/PageTemplate.tid
index a58405357..f5c9b59b2 100644
--- a/core/templates/PageTemplate.tid
+++ b/core/templates/PageTemplate.tid
@@ -6,9 +6,7 @@ title: $:/templates/PageTemplate
 <!-- The sidebar header -->
 <header class="sidebar-header">
 
-<div>
-{{SiteTitle}}<br><small>{{SiteSubtitle}}</small>
-</div>
+{{SiteTitle}}.title <br><small>{{SiteSubtitle}}</small>
 
 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" listview=classic itemClass="tw-menu-list-item"/>
 
diff --git a/core/templates/ViewTemplate.tid b/core/templates/ViewTemplate.tid
index e53a51c74..e671679f6 100644
--- a/core/templates/ViewTemplate.tid
+++ b/core/templates/ViewTemplate.tid
@@ -2,8 +2,8 @@ title: $:/templates/ViewTemplate
 modifier: JeremyRuston
 
 <span class="tw-tiddler-controls">
-<$button message="tw-close-tiddler" class="btn-invisible">{{$:/core/images/close-button.svg}}</$button>
 <$button message="tw-edit-tiddler" class="btn-invisible">{{$:/core/images/edit-button.svg}}</$button>
+<$button message="tw-close-tiddler" class="btn-invisible">{{$:/core/images/close-button.svg}}</$button>
 </span>
 <span class="title">
 <$view field="title"/>