Merge branch 'ikiwiki' into da

Conflicts:
	templates.mdwn

1 files changed, 5 insertions, 0 deletions

diff --git a/style.css b/style.css
index 35a1331..6e2afce 100644
--- a/style.css
+++ b/style.css
@@ -275,6 +275,7 @@ div.progress-done {
 @media print {
 	.actions { display: none; }
 	.tags { display: none; }
+	.trails { display: none; }
 	.feedbutton { display: none; }
 	#searchform { display: none; }
 	.blogform, #blogform { display: none; }
@@ -502,6 +503,10 @@ a.openid_large_btn:focus {
 	background: url(ikiwiki/images/pbar-ani.gif);
 }
 
+.trails {
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
 .trail {
 	display: block;
 	clear: both;