Merge branch 'ikiwiki' into da

Conflicts (manually resolved):
	ikiwiki/pagespec.mdwn
	shortcuts.mdwn

1 files changed, 10 insertions, 1 deletions

diff --git a/style.css b/style.css
index 6e2afce..067a3bf 100644
--- a/style.css
+++ b/style.css
@@ -58,7 +58,8 @@ nav {
 	border-bottom: 1px solid #000;
 }
 
-.inlinecontent {
+.inlinecontent,
+.inlineenclosure {
 	margin-top: .4em;
 }
 
@@ -202,6 +203,13 @@ div.recentchanges {
 	margin-top: 1em;
 }
 
+.archivepagedate {
+	font-style: italic;
+}
+.archivepage {
+	margin-bottom: 1em;
+}
+
 .error {
 	color: #C00;
 }
@@ -316,6 +324,7 @@ div.progress-done {
 .popup .paren,
 .popup .expand {
 	display: none;
+	text-align: left;
 }
 .popup:hover .balloon,
 .popup:focus .balloon {