diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-15 06:27:17 -0800 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-15 06:27:17 -0800 |
commit | eb1cdd037646b3697b64753652669fa9e25a5c8e (patch) | |
tree | 2f9dd9bd70329d5997993eced0a9f94a80895b8a /themes | |
parent | e41a2d4e5226c45a5201df91ca6633a40b357630 (diff) | |
parent | 409121942590e12692eaf4e6e9e8b71bfe5ed60c (diff) |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'themes')
-rw-r--r-- | themes/wind/css/fix-ie.css | 1 | ||||
-rw-r--r-- | themes/wind/css/screen.css | 15 | ||||
-rw-r--r-- | themes/wind/js/ui.init.js | 10 |
3 files changed, 18 insertions, 8 deletions
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css index 376dac74..4f0d0888 100644 --- a/themes/wind/css/fix-ie.css +++ b/themes/wind/css/fix-ie.css @@ -4,6 +4,7 @@ #g-banner { z-index: 2; + zoom: 1; } input.submit { diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 630e8bbd..e96b259d 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -275,6 +275,13 @@ td { z-index: 1; } +/* Search results ~~~~~~~~~~~~~~~~~~~~~~~~ */ + +#g-content #g-search-results { + margin-top: 1em; + padding-top: 1em; +} + /* Individual photo content ~~~~~~~~~~~~~~ */ #g-item { @@ -300,14 +307,10 @@ td { padding-right: 1.2em; } -#g-content #g-search-results { - margin-top: 1em; - padding-top: 1em; -} - /* In-line editing ~~~~~~~~~~~~~~~~~~~~~~ */ + #g-in-place-edit-message { - background-color: #FFF; + background-color: #fff; } /** ******************************************************************* diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js index f9fb8519..64eb6bc3 100644 --- a/themes/wind/js/ui.init.js +++ b/themes/wind/js/ui.init.js @@ -43,7 +43,7 @@ $(document).ready(function() { }); } - // Album view only + // Album and search results views if ($("#g-album-grid").length) { // Set equal height for album items and vertically align thumbnails/metadata $('.g-item').equal_heights().gallery_valign(); @@ -64,7 +64,13 @@ $(document).ready(function() { $(this).height("auto"); var context_menu = $(this).find(".g-context-menu"); var adj_height = $(this).height() + context_menu.height(); - $(this).height(adj_height); + if ($(this).next().height() > $(this).height()) { + $(this).height($(this).next().height()); + } else if ($(this).prev().height() > $(this).height()) { + $(this).height($(this).prev().height()); + } else { + $(this).height(adj_height); + } }, function() { // Reset item height and position |