Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/debian/changelog b/debian/changelog
index 842eb680677c0a4c3bddec4397c6632649a41230..b87d6f9eb091b3d689639198181dbf5fd7275801 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ikiwiki (3.20120726) UNRELEASED; urgency=low
     page for a configurable number of seconds, which then redirects to retry.
     To enable this protection, set cgi_overload_delay to the number of
     seconds to wait. This is not enabled by default.
+  * Add back a 1em margin between archivepage divs.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 30 Aug 2012 11:56:12 -0400
 

diff --git a/doc/style.css b/doc/style.css
index 5fb4100324b0c9d5d8d794adfece2caff42a3047..424d438167dd9ee5272ec55971f261515a4d95ff 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -205,6 +205,9 @@ div.recentchanges {
 .archivepagedate {
        font-style: italic;
 }
+.archivepage {
+       margin-bottom: 1em;
+}
 
 .error {
        color: #C00;