summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-18 18:22:02 +0000
committerBrion Vibber <brion@pobox.com>2010-02-18 18:22:02 +0000
commit2a97901f7037b0eca391ece4517888a4356f3981 (patch)
treefd2a0a2a4d0390b5a9fd26afa4875f6c07377bfb
parent22ff358ba8d1fd0396136e1de570d788dd0727b6 (diff)
parent310ac319957d437ab3bc0619419c750c98ebeaf0 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
-rw-r--r--theme/base/css/display.css1
-rw-r--r--theme/default/css/display.css2
-rw-r--r--theme/identica/css/display.css2
3 files changed, 3 insertions, 2 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 89fe810c6..380975e32 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1035,6 +1035,7 @@ text-decoration:underline;
.notice .entry-title {
overflow:hidden;
+word-wrap:break-word;
}
.notice .entry-title.ov {
overflow:visible;
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index a2f101342..71470d55d 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -306,7 +306,7 @@ background-position:5px -1181px;
}
.entity_edit a {
-background-position: 5px -718px;
+background-position: 5px -719px;
}
.entity_send-a-message a {
background-position: 5px -852px;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index e21404745..14a82a8de 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -305,7 +305,7 @@ background-position:5px -1181px;
}
.entity_edit a {
-background-position: 5px -718px;
+background-position: 5px -719px;
}
.entity_send-a-message a {
background-position: 5px -852px;