Merge commit 'upstream/master'

2 files changed, 17 insertions, 8 deletions

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