Merge branch 'ikiwiki' into da

Conflicts (resolved manually):
	shortcuts.mdwn

1 files changed, 8 insertions, 0 deletions

diff --git a/style.css b/style.css
index fcf39be..7bbfe5d 100644
--- a/style.css
+++ b/style.css
@@ -493,3 +493,11 @@ a.openid_large_btn:focus {
 .openid_selected {
 	border: 4px solid #DDD;
 }
+
+.fileupload-content .ui-progressbar {
+	width: 200px;
+	height: 20px;
+}
+.fileupload-content .ui-progressbar-value {
+	background: url(ikiwiki/images/pbar-ani.gif);
+}