From 07268d5c5208ede6259da80680983dc9392a4428 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 18:07:58 -0700 Subject: Key off of g-photo, rather than g-item, when fitting resized photos inside their parent. --- themes/wind/js/ui.init.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'themes/wind') diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js index 0126c36b..be03b6a8 100644 --- a/themes/wind/js/ui.init.js +++ b/themes/wind/js/ui.init.js @@ -87,12 +87,12 @@ $(document).ready(function() { } // Photo/Item item view - if ($("#g-item").length) { + if ($("#g-photo").length) { // Ensure the resized image fits within its container - $("#g-item").gallery_fit_photo(); + $("#g-photo").gallery_fit_photo(); // Initialize context menus - var resize = $("#g-item").gallery_get_photo(); + var resize = $("#g-photo").gallery_get_photo(); $(resize).hover(function(){ $(this).gallery_context_menu(); }); -- cgit v1.2.3 From 46fda847ad625c085b020f719da1c37660ab93b9 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 18:13:26 -0700 Subject: Moved movie context-menu up to just under the movie. Fixed contextual menu font size on resize and movie pages. --- themes/wind/css/screen.css | 10 ++++------ themes/wind/views/movie.html.php | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'themes/wind') diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 1a7fc110..bd17e0e4 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -73,7 +73,9 @@ h3 { font-size: .8em; } -#g-content #g-album-grid .g-item { +#g-album-grid .g-item, +#g-item #g-photo, +#g-item #g-movie { font-size: .7em; } @@ -284,11 +286,7 @@ td { #g-item #g-photo, #g-item #g-movie { - padding: 1em 0; -} - -#g-item #g-photo, -#g-item #g-movie { + padding: 2.2em 0; position: relative; } diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php index 116fd95e..d91ffbc5 100644 --- a/themes/wind/views/movie.html.php +++ b/themes/wind/views/movie.html.php @@ -26,6 +26,7 @@
movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?> + context_menu($item, "#g-movie-id-{$item->id}") ?>
@@ -34,5 +35,4 @@
photo_bottom() ?> - context_menu($item, "#g-movie-id-{$item->id}") ?> -- cgit v1.2.3 From 56c543dbe42ebb77fb3f5742480a186954796837 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 21:41:11 -0700 Subject: Removed todo, it's done :) --- themes/wind/css/screen.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'themes/wind') diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index bd17e0e4..e46ba8e6 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -11,8 +11,6 @@ * 5) Navigation and menus * 6) jQuery and jQuery UI * 7) Right-to-left language styles - * - * @todo Review g-buttonset and it's usage here and admin_wind */ /** ******************************************************************* -- cgit v1.2.3