diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-25 14:15:54 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-25 14:15:54 -0700 |
| commit | c11064a5398db824f2623c5763b3fdfdf8ae3c39 (patch) | |
| tree | 86663a25bea567c4e0962cb3e63a79f7f82af891 /theme | |
| parent | 7fc8b6af4ae9a784b797d4f7aef49c820bb10bdf (diff) | |
Updated 'more' anchor for attachments to do an XHR GET
Conflicts:
lib/attachmentlist.php
plugins/OStatus/classes/Ostatus_profile.php
Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
Diffstat (limited to 'theme')
| -rw-r--r-- | theme/base/css/display.css | 9 | ||||
| -rw-r--r-- | theme/default/css/display.css | 3 | ||||
| -rw-r--r-- | theme/identica/css/display.css | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css index a2e4cdf2a..9044021f5 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1284,9 +1284,16 @@ height:16px; position:relative; padding-left:16px; } -#attachments .attachment { +#attachments .attachment, +.notice .attachment.more { padding-left:0; } +.notice .attachment.more:before { +content:'( '; +} +.notice .attachment.more:after { +content:' )'; +} .notice .attachment img { position:absolute; top:18px; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index d92a53965..c08a03061 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -410,7 +410,8 @@ background-position: 0 -1714px; .notice .attachment { background-position:0 -394px; } -#attachments .attachment { +#attachments .attachment, +.notice .attachment.more { background:none; } .notice-options .notice_reply { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 59cb3c38a..62a9e25d8 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -409,7 +409,8 @@ background-position: 0 -1714px; .notice .attachment { background-position:0 -394px; } -#attachments .attachment { +#attachments .attachment, +.notice .attachment.more { background:none; } .notice-options .notice_reply { |