diff options
| author | jhilden <jakobhilden@gmail.com> | 2009-09-26 11:27:45 -0400 |
|---|---|---|
| committer | jhilden <jakobhilden@gmail.com> | 2009-09-26 11:27:45 -0400 |
| commit | 21341d552f7e56341b29c020e1149d9c41182c84 (patch) | |
| tree | 70502de8e6784d749b47b445838d8719f21af6bf /lib | |
| parent | 4345e96d1db63c8488eb7a35cdc8e42987ba53f5 (diff) | |
| parent | 0abd6f63bc8a1976a62bc4b57bbabe10d62b5c8d (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gallery.common.css | 13 | ||||
| -rw-r--r-- | lib/gallery.common.js | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css index f4d46a4e..eb686bcf 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -12,17 +12,16 @@ * 1) Text **********************************************************************/ - .g-txt-small { - font-size: .8em; + font-size: .8em; } .g-txt-big { - font-size: 1.2em; + font-size: 1.2em; } .g-txt-right { - text-align: right; + text-align: right; } /** ******************************************************************* @@ -99,7 +98,7 @@ form .g-error { .g-draggable, .ui-draggable { - cursor: move; + cursor: move; } .g-target { @@ -110,11 +109,11 @@ form .g-error { **********************************************************************/ .g-right { - float: right; + float: right; } .g-left { - float: left; + float: left; } .g-first { diff --git a/lib/gallery.common.js b/lib/gallery.common.js index 81904548..6e3efe5a 100644 --- a/lib/gallery.common.js +++ b/lib/gallery.common.js @@ -116,7 +116,7 @@ var in_progress = 0; $(".gContextMenu *").removeAttr('title'); $(".gContextMenu ul").hide(); - $(".gContextMenu").hover( + $(".gContextMenu li").hover( function() { if (in_progress == 0) { $(this).find("ul").slideDown("fast", function() { in_progress = 1; }); @@ -125,7 +125,7 @@ } }, function() { - $(this).find("ul").slideUp("slow", function() { in_progress = 0; }); + $(this).find(".gContext").slideUp("slow", function() { in_progress = 0; }); } ); } |