From 6b1c0573eaff7d22f625452cfbfe2967c0647ea2 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Tue, 8 Jun 2010 10:34:13 +0000
Subject: Update to ikiwiki b10d353490197b576ef7bf2e8bf8016039efbd2d.

---
 local.css | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'local.css')

diff --git a/local.css b/local.css
index a275bc07..d705f3b4 100644
--- a/local.css
+++ b/local.css
@@ -1,6 +1,6 @@
 /* ikiwiki local style sheet
 
-   Copyright © 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright © 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document under
    the terms of the GNU Free Documentation License, Version 1.2 or any later
@@ -138,7 +138,7 @@ a:hover
   padding: 0.5em;
 }
 
-#sidebar
+.sidebar
 {
   background-color: #f0f0f0;
 }
@@ -159,25 +159,24 @@ a:hover
 }
 
 
-/* Variable width.  */
-#sidebar
+/* Placement.  */
+.sidebar
 {
   width: auto;
-  /* ikiwiki's default for `width'.  */
-  min-width: 20ex;
+  margin-left: 20px;
 }
 
 /* Less indentation for list items.  */
-#sidebar ul
+.sidebar ul
 {
   padding-left: 2ex;
 }
-#sidebar ul ul
+.sidebar ul ul
 {
   padding-left: 2.5ex;
 }
 /* Make the logo appear centered */
-#sidebar img {
+.sidebar img {
 	display: block;
 	margin-left: auto;
 	margin-right: auto;
-- 
cgit v1.2.3


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(-)

(limited to 'local.css')

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