From fe93ce2017c20bf1e81a5684d44460c6be68321b Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 17 Feb 2014 21:26:36 -0800
Subject: [PATCH] revert previous patch and move sidebar back to its original
 location

---
 local.css           |  1 -
 templates/page.tmpl | 15 +++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/local.css b/local.css
index 3a7e571..ce5b8e5 100644
--- a/local.css
+++ b/local.css
@@ -226,7 +226,6 @@ div.recentchanges {
 .sidebar {
 	width: 20ex;
 	float: right;
-    vertical-align: top;
 	margin-left: 4px;
 	margin-bottom: 4px;
 	margin-top: -1px;
diff --git a/templates/page.tmpl b/templates/page.tmpl
index e83c6cf..d042d13 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -125,6 +125,13 @@
 
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
+<TMPL_UNLESS DYNAMIC>
+<TMPL_IF SIDEBAR>
+<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
+<TMPL_VAR SIDEBAR>
+<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+</TMPL_UNLESS>
 
 <div id="pagebody">
 
@@ -155,14 +162,6 @@
 
 </div>
 
-<TMPL_UNLESS DYNAMIC>
-<TMPL_IF SIDEBAR>
-<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
-<TMPL_VAR SIDEBAR>
-<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
-</TMPL_UNLESS>
-
 <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
-- 
2.39.2