diff options
author | zottel <github@zottel.net> | 2012-03-16 08:33:01 +0100 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-03-16 08:33:01 +0100 |
commit | ea4c806c5c3adacb6ef585de657e5f34c2e24c98 (patch) | |
tree | 1e3314f76eefd8f7d014ae8e4a218dc9663ae3d7 /view/theme/dispy-dark/theme.php | |
parent | 69f4448adaf7afddf00deeb2f832938d5505abcf (diff) | |
parent | 47e1b8d0c07d79c33f8b2de52145aa751d4b955a (diff) | |
download | volse-hubzilla-ea4c806c5c3adacb6ef585de657e5f34c2e24c98.tar.gz volse-hubzilla-ea4c806c5c3adacb6ef585de657e5f34c2e24c98.tar.bz2 volse-hubzilla-ea4c806c5c3adacb6ef585de657e5f34c2e24c98.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy-dark/theme.php')
-rw-r--r-- | view/theme/dispy-dark/theme.php | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index 6f8243058..c0611ce83 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -74,16 +74,6 @@ $(document).ready(function() { event.stopPropagation(); }); - // usermenu - //$('html').click(function() { -// $('#user-menu-popup').css('display: none'); - //document.getElementById("usermenu-popup").style.display = "none"; - //}); - - //$('#user-menu').click(function(event) { - // event.stopPropagation(); - //}); - function toggleToolbar() { if ( $('#nav-floater').is(':visible') ) { $('#nav-floater').slideUp('fast'); @@ -106,11 +96,20 @@ $(document).ready(function() { $(this).css({color: '#eec'}); }); - $('#profile-photo-wrapper').mouseover(function() { - $('#profile-edit-side-div').css({display: 'block'}); +/* $('#profile-photo-wrapper').mouseover(function() { + $('.profile-edit-side-div').css({display: 'block'}); }).mouseout(function() { - $('#profile-edit-side-div').css({display: 'none'}); + $('.profile-edit-side-div').css({display: 'none'}); + return false; }); + + $('img.photo').mouseover(function() { + $('.profile-edit-side-div').css({display: 'block'}); + }).mouseout(function() { + $('.profile-edit-side-div').css({display: 'none'}); + return false; + });*/ + }); </script> EOT; |