diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-02-24 20:52:45 -0500 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-02-24 20:52:45 -0500 |
| commit | c187bf55974347f7ddb4f28714af57861dce8f08 (patch) | |
| tree | 4398b456d88ce79977959b25ba1a0f6fe0c1d77f /theme | |
| parent | 20d6a7caed6636c28cc7b95c584549691dff4388 (diff) | |
| parent | 8914b69d5055c1bc7d0604ee338ffdaf6b0a8606 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
EVENTS.txt
db/statusnet.sql
lib/queuemanager.php
Diffstat (limited to 'theme')
| -rw-r--r-- | theme/base/css/display.css | 2 | ||||
| -rw-r--r-- | theme/default/css/display.css | 5 | ||||
| -rw-r--r-- | theme/identica/css/display.css | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 89fe810c6..52f97f6b1 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; @@ -1489,6 +1490,7 @@ text-align:center; } .aside .tag-cloud { font-size:0.8em; +word-wrap:break-word; } .tag-cloud li { display:inline; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index a2f101342..deb985909 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -184,6 +184,7 @@ button.close, .form_user_unsubscribe input.submit, .form_group_join input.submit, .form_user_subscribe input.submit, +.form_remote_authorize input.submit, .entity_subscribe a, .entity_moderation p, .entity_sandbox input.submit, @@ -291,6 +292,7 @@ background-position:0 1px; .form_group_leave input.submit, .form_user_subscribe input.submit, .form_user_unsubscribe input.submit, +.form_remote_authorize input.submit, .entity_subscribe a { background-color:#AAAAAA; color:#FFFFFF; @@ -301,12 +303,13 @@ background-position:5px -1246px; } .form_group_join input.submit, .form_user_subscribe input.submit, +.form_remote_authorize input.submit, .entity_subscribe a { 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..0e54d82e2 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -184,6 +184,7 @@ button.close, .form_user_unsubscribe input.submit, .form_group_join input.submit, .form_user_subscribe input.submit, +.form_remote_authorize input.submit, .entity_subscribe a, .entity_moderation p, .entity_sandbox input.submit, @@ -290,6 +291,7 @@ background-position:0 1px; .form_group_leave input.submit, .form_user_subscribe input.submit, .form_user_unsubscribe input.submit, +.form_remote_authorize input.submit, .entity_subscribe a { background-color:#AAAAAA; color:#FFFFFF; @@ -300,12 +302,13 @@ background-position:5px -1246px; } .form_group_join input.submit, .form_user_subscribe input.submit, +.form_remote_authorize input.submit, .entity_subscribe a { background-position:5px -1181px; } .entity_edit a { -background-position: 5px -718px; +background-position: 5px -719px; } .entity_send-a-message a { background-position: 5px -852px; |