From 9f86f98cb12df7e1fefa15e9719ec0c489414f2d Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Mon, 11 Jun 2012 12:44:10 +0100
Subject: [PATCH] Got the zooming navigator working again

Albeit, it doesn't play well with the fixed navbar
---
 core/modules/macros/zoomer.js   | 10 +++++++++-
 core/templates/PageTemplate.tid | 18 +++++++-----------
 tw5.com/wiki/styles.css.tid     | 24 ------------------------
 3 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/core/modules/macros/zoomer.js b/core/modules/macros/zoomer.js
index cd9432399..7fc9c9a5c 100644
--- a/core/modules/macros/zoomer.js
+++ b/core/modules/macros/zoomer.js
@@ -100,7 +100,15 @@ exports.handleEvent = function(event) {
 
 exports.executeMacro = function() {
 	this.inZoomer = false;
-	return $tw.Tree.Element("div",{},[]);
+	return $tw.Tree.Element("div",{
+		style: {
+			"position": "absolute",
+			"right": "0",
+			"top": "0",
+			"min-width": "16px",
+			"height": "100%"
+		}
+	},[]);
 };
 
 })();
diff --git a/core/templates/PageTemplate.tid b/core/templates/PageTemplate.tid
index a26e10409..c49186817 100644
--- a/core/templates/PageTemplate.tid
+++ b/core/templates/PageTemplate.tid
@@ -1,9 +1,13 @@
 title: $:/templates/PageTemplate
 
-<div class="container">
-<div class="row">
-<div class="span12">
+<div class="container-fluid">
 <<story story:"$:/StoryTiddlers" storyview:scroller><
+{{navigation-panel{
+<<chooser>>
+}}}
+{{zoomer-panel{
+<<zoomer>>
+}}}
 <div class="navbar navbar-fixed-top">
 <div class="navbar-inner">
 <div class="container">
@@ -15,13 +19,5 @@ title: $:/templates/PageTemplate
 </div>
 </div>
 </div>
-{{navigation-panel{
-<<chooser>>
-}}}
-{{zoomer-panel{
-<<zoomer>>
-}}}
 >>
 </div>
-</div>
-</div>
diff --git a/tw5.com/wiki/styles.css.tid b/tw5.com/wiki/styles.css.tid
index 24d0b107b..d5d3daa3a 100644
--- a/tw5.com/wiki/styles.css.tid
+++ b/tw5.com/wiki/styles.css.tid
@@ -185,27 +185,3 @@ a.tw-tiddlylink-missing {
 	color: #fff;
 	background: #a55;
 }
-
-body {
-	-webkit-transition: -webkit-transform 0.3s ease-in-out;
-}
-
-body.in-zoomer {
-	-webkit-transition: none;
-}
-
-.zoomer-panel {
-	position: absolute;
-	right: 0;
-	top: 0;
-	min-width: 16px;
-	height: 100%; /* Makes the element the same height as the body, since the body is position: relative */
-}
-
-body.in-zoomer .zoomer-panel {
-	background: rgba(235,235,235,0.5);
-}
-
-body.in-zoomer iframe {
-	visibility: hidden;
-}