summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-10-06 16:21:35 +0200
committerJonas Smedegaard <dr@jones.dk>2011-10-06 16:21:35 +0200
commitb69bfd4e9642f5cd234b70c11ef8f77f86d407c9 (patch)
tree64d10c318d51745dccc0c6e15d65c8d066aeee59
parent079b7a3b8cb34f2d2c24202a6c91ec5b912c029a (diff)
parent061647d4e7e132893980756a7e79a37ff654410c (diff)
Merge commit 'refs/top-bases/sass' into sass
Conflicts (resolved manually: apply default/_ikiwiki.scss, suppress rest): actiontabs/style.css blueview/style.css default/_ikiwiki.scss goldtype/style.css
-rw-r--r--default/_ikiwiki.scss7
1 files changed, 7 insertions, 0 deletions
diff --git a/default/_ikiwiki.scss b/default/_ikiwiki.scss
index c322456..f42a5f6 100644
--- a/default/_ikiwiki.scss
+++ b/default/_ikiwiki.scss
@@ -643,6 +643,13 @@ 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);
}
@mixin ikiwiki {