Merge branch 'master'

Conflicts:
	doc/ikiwiki-makerepo.mdwn

1 files changed, 21 insertions, 6 deletions

diff --git a/doc/style.css b/doc/style.css
index 5787ef65e..98a28f347 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -12,7 +12,7 @@
 	display: block;
 }
 
-.author {
+.inlineheader .author {
 	margin: 0;
 	font-size: 18px;
 	font-weight: bold;
@@ -23,6 +23,8 @@
 	margin: 0;
 	padding: 6px;
 	list-style-type: none;
+}
+.pageheader .actions ul {
 	border-bottom: 1px solid #000;
 }
 
@@ -42,6 +44,9 @@ div.inlinecontent {
 .pagefooter {
 	clear: both;
 }
+.inlinefooter {
+	clear: both;
+}
 
 .tags {
 }
@@ -339,11 +344,6 @@ input#searchbox {
 	border: 2px solid;
 	background-color: #dee;
 	color: black;
-	
-	/* Nonstandard, but very nice. */
-	opacity: 0.95;
-	-moz-opacity: 0.95;
-	filter: alpha(opacity=95);
 }
 
 /* Formbuilder styling */
@@ -372,3 +372,18 @@ legend {
 span.color {
 	padding: 2px;
 }
+
+.comment-header {
+	font-style: italic;
+	margin-top: .3em;
+}
+.comment .author {
+	font-weight: bold;
+}
+.comment-subject {
+	font-weight: bold;
+}
+.comment {
+	border: 1px solid #aaa;
+	padding: 3px;
+}