4 files changed, 30 insertions, 11 deletions
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index 376dac74..f7f08486 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -4,6 +4,17 @@
 
 #g-banner {
   z-index: 2;
+  zoom: 1;
+}
+
+#g-photo,
+#g-movie {
+	zoom: 1;
+}
+
+#g-photo .g-context-menu,
+#g-movie .g-context-menu {
+	width: 240px;
 }
 
 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..6edf6be4 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
@@ -92,8 +98,7 @@ $(document).ready(function() {
     $("#g-photo,#g-movie").gallery_fit_photo();
 
     // Initialize context menus
-    var resize = $("#g-photo,#g-movie").gallery_get_photo();
-    $(resize).hover(function(){
+    $("#g-photo,#g-movie").hover(function(){
       $(this).gallery_context_menu();
     });
 
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 2dcc5d70..61e34145 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -91,7 +91,7 @@
           <div id="g-site-menu" style="visibility: hidden">
           <?= $theme->site_menu() ?>
           </div>
-          <script> $(document).ready(function() { $("#g-site-menu").css("visibility", "visible"); }) </script>
+          <script type="text/javascript"> $(document).ready(function() { $("#g-site-menu").css("visibility", "visible"); }) </script>
 
           <?= $theme->header_bottom() ?>
         </div>