Merge branch 'master-da' into master-nonedit-damaster-nonedit-da

Conflicts (all dropped, as in earlier changes in this branch):

	ikiwiki.mdwn
	ikiwiki/blog.mdwn
	ikiwiki/directive.mdwn
	ikiwiki/formatting.mdwn
	ikiwiki/pagespec.mdwn
	ikiwiki/pagespec/attachment.mdwn
	templates.mdwn

1 files changed, 20 insertions, 0 deletions

diff --git a/style.css b/style.css
index 44a6e0f..5787ef6 100644
--- a/style.css
+++ b/style.css
@@ -30,6 +30,10 @@
 	border-bottom: 0;
 }
 
+div.inlinecontent {
+	margin-top: .4em;
+}
+
 .actions li {
 	display: inline;
 	padding: .2em .4em;
@@ -249,6 +253,22 @@ div.poll {
 	border: 1px solid #aaa;
 }
 
+div.progress {
+	margin-top: 1ex;
+	margin-bottom: 1ex;
+	border: 1px solid #888;
+	width: 400px;
+	background: #eee;
+	color: black !important;
+	padding: 1px;
+}
+div.progress-done {
+	background: #ea6 !important;
+	color: black !important;
+	text-align: center;
+	padding: 1px;
+}
+
 input#openid_url {
 	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
 	background-color: #fff;