diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-11-09 20:31:14 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-11-09 20:31:14 -0800 |
| commit | a9bb4ab4eb9c2883b5998538406bea4e5c99aeca (patch) | |
| tree | 61d564360e19d717e4555b5e831cf9a33bcec41c /themes/wind | |
| parent | 4f8728029dfc283f5d26328ec21a2db455e97651 (diff) | |
| parent | 64f5a98bd60410e54b6d0c59c713bb7e3eff0a83 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'themes/wind')
| -rw-r--r-- | themes/wind/css/screen.css | 12 | ||||
| -rw-r--r-- | themes/wind/js/ui.init.js | 6 | ||||
| -rw-r--r-- | themes/wind/views/movie.html.php | 2 |
3 files changed, 8 insertions, 12 deletions
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 1a7fc110..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 */ /** ******************************************************************* @@ -73,7 +71,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 +284,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/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(); }); 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 @@ <div id="g-movie" class="ui-helper-clearfix"> <?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?> + <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?> </div> <div id="g-info"> @@ -34,5 +35,4 @@ </div> <?= $theme->photo_bottom() ?> - <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?> </div> |