From ceafdbd492684b8545c9b944e2b0aaec84994c5c Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Thu, 10 Jun 2010 22:27:54 +0200
Subject: Update to ikiwiki a31ce0e97d1e1c476a1fcdb52a2d78cadb845557.

---
 .templates/editpage.tmpl |  2 ++
 .templates/page.tmpl     |  4 ++++
 local.css                | 14 --------------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl
index 53ce934e..237a6c92 100644
--- a/.templates/editpage.tmpl
+++ b/.templates/editpage.tmpl
@@ -17,7 +17,9 @@
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
 <li>
+<div class="editcontentdiv">
 <TMPL_VAR FIELD-EDITCONTENT><br />
+</div>
 </li>
 <TMPL_IF NAME="CAN_COMMIT">
 <li>
diff --git a/.templates/page.tmpl b/.templates/page.tmpl
index 45d28697..4ec3b4bf 100644
--- a/.templates/page.tmpl
+++ b/.templates/page.tmpl
@@ -118,6 +118,8 @@
 <TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+<div id="pagebody">
+
 <TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
@@ -135,6 +137,8 @@
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+</div>
+
 <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>
diff --git a/local.css b/local.css
index d705f3b4..8669e5e3 100644
--- a/local.css
+++ b/local.css
@@ -51,7 +51,6 @@ pre
   margin-left: 3em;
   font-weight: bold;
   padding: 0.5em;
-  overflow: auto;
 }
 
 a
@@ -286,16 +285,3 @@ a:hover
   padding-top: 0.3em;
   padding-bottom: 0.3em;
 }
-
-div.recentchanges
-{
-  clear: none;
-  width: auto;
-}
-
-/* Stop inlined pages (in news, tag/*, and so on) from running into the
-   sidebar.  */
-.inlinepage
-{
-  overflow: auto;
-}
-- 
cgit v1.2.3