diff options
| author | Robin Millette <millette@controlyourself.ca> | 2009-05-24 04:44:52 -0400 |
|---|---|---|
| committer | Robin Millette <millette@controlyourself.ca> | 2009-05-24 04:44:52 -0400 |
| commit | 8c2473a2275f25c144d8e6a41bf8c17fef465103 (patch) | |
| tree | ca328036214589c3c757c166a43c8d2df1a5010a | |
| parent | b5ac6e31f2f148164860aeabec6899b75d7292ec (diff) | |
| parent | fde9b09435f6d7fc6cb3f8ccc37dcb3f5ccdb056 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
| -rw-r--r-- | js/util.js | 16 | ||||
| -rw-r--r-- | theme/default/css/display.css | 4 | ||||
| -rw-r--r-- | theme/identica/css/display.css | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/js/util.js b/js/util.js index 4f2b036fa..1b75c5e22 100644 --- a/js/util.js +++ b/js/util.js @@ -204,7 +204,6 @@ $(document).ready(function(){ $("#notices_primary .notices").prepend(document._importNode(li, true)); $("#notices_primary .notice:first").css({display:"none"}); $("#notices_primary .notice:first").fadeIn(2500); - NoticeHover(); NoticeReply(); } } @@ -222,17 +221,16 @@ $(document).ready(function(){ NoticeReply(); }); + function NoticeHover() { - $("#content .notice").hover( - function () { - $(this).addClass('hover'); - }, - function () { - $(this).removeClass('hover'); - } - ); + function mouseHandler(e) { + $(e.target).closest('li.hentry')[(e.type === 'mouseover') ? 'addClass' : 'removeClass']('hover'); + }; + $('#content .notices').mouseover(mouseHandler); + $('#content .notices').mouseout(mouseHandler); } + function NoticeReply() { if ($('#notice_data-text').length > 0) { $('#content .notice').each(function() { diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 16c9322a5..bc6bd2ee4 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -193,7 +193,9 @@ background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-r } .notices div.entry-content, -.notices div.notice-options { +.notices div.notice-options, +.notices li.hover .notices div.entry-content, +.notices li.hover .notices div.notice-options { opacity:0.4; } .notices li.hover div.entry-content, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 2fb123a20..b181d9056 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -193,7 +193,9 @@ background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-r } .notices div.entry-content, -.notices div.notice-options { +.notices div.notice-options, +.notices li.hover .notices div.entry-content, +.notices li.hover .notices div.notice-options { opacity:0.4; } .notices li.hover div.entry-content, |