Merge commit 'refs/top-bases/sass' into sass

Conflicts:
	actiontabs/style.css
	blueview/style.css
	default/_ikiwiki.scss

1 files changed, 11 insertions, 3 deletions

diff --git a/default/_ikiwiki.scss b/default/_ikiwiki.scss
index 43e8722..c322456 100644
--- a/default/_ikiwiki.scss
+++ b/default/_ikiwiki.scss
@@ -188,12 +188,14 @@ div.recentchanges {
 	font-size: small;
 }
 
-.recentchanges .pagelinks {
+.recentchanges .pagelinks,
+.recentchanges .revert {
 	float: right;
 	margin: 0;
 	width: 60%;
 }
 
+.blogform,
 #blogform {
 	padding: 10px 10px;
 	border: 1px solid #aaa;
@@ -266,6 +268,10 @@ span.color {
 	font-weight: bold;
 }
 
+.comment-avatar {
+	float: right;
+}
+
 .comment {
 	border: 1px solid #aaa;
 	padding: 3px;
@@ -306,6 +312,7 @@ div.progress-done {
 		display: none;
 	}
 
+	.blogform,
 	#blogform {
 		display: none;
 	}
@@ -601,7 +608,8 @@ li.L8 {
 	padding: 10px;
 }
 
-#openid_btns, #openid_btns br {
+#openid_btns,
+#openid_btns br {
 	clear: both;
 }
 
@@ -629,7 +637,7 @@ a.openid_large_btn:focus {
 }
 
 a.openid_large_btn:focus {
-	-moz-outline-style: none;
+	outline-style: none;
 }
 
 .openid_selected {