Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png
index c4e3713302fe9bea6d32d83bb2449a4c5107a6f3..f83c30177c6a5aa8c13cc8bbaae41e7819c93ddf 100644 (file)
Binary files a/theme/base/images/icons/icons-01.png and b/theme/base/images/icons/icons-01.png differ

diff --git a/theme/base/images/icons/twotone/green/x.gif b/theme/base/images/icons/twotone/green/x.gif
new file mode 100644 (file)
index 0000000..ffb2efe
Binary files /dev/null and b/theme/base/images/icons/twotone/green/x.gif differ

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 40fdb255b92db46135de21114216f54ded7776b3..910f915a867fda3747128d53e631f16a6c4e9c30 100644 (file)
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -115,7 +115,8 @@ opacity:0;
 .notice-options .notice_delete,
 #new_group a,
 .pagination .nav_prev a,
-.pagination .nav_next a {
+.pagination .nav_next a,
+button.close {
 background-image:url(../../base/images/icons/icons-01.png);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -167,10 +168,7 @@ background-color:#EFF3DC;
 }
 
 button.close {
-background-image:url(../../base/images/icons/twotone/green/x.gif);
-background-repeat:no-repeat;
-background-position:0 47%;
-background-color:transparent;
+background-position:0 -1120px;
 }
 
 #anon_notice {

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 3b59652c41696bbf4c21f23737fa22a8d72cc90e..2aa087331e89215eea97e36e7f8d37d137aaa451 100644 (file)
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -115,7 +115,8 @@ opacity:0;
 .notice-options .notice_delete,
 #new_group a,
 .pagination .nav_prev a,
-.pagination .nav_next a {
+.pagination .nav_next a,
+button.close {
 background-image:url(../../base/images/icons/icons-01.png);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -167,10 +168,7 @@ background-color:#EFF3DC;
 }
 
 button.close {
-background-image:url(../../base/images/icons/twotone/green/x.gif);
-background-repeat:no-repeat;
-background-position:0 47%;
-background-color:transparent;
+background-position:0 -1120px;
 }
 
 #anon_notice {