4 files changed, 11 insertions, 22 deletions
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 36231b0d..d7eb19e6 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -120,14 +120,18 @@ td {
 
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#g-sidebar form {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 fieldset {
   border: 1px solid #ccc;
   padding: .8em 1em !important;
 }
 
 #g-banner fieldset,
-#g-sidebar fieldset,
-.g-short-form fieldset {
+#g-sidebar fieldset {
   border: none;
 }
 
@@ -139,8 +143,7 @@ legend {
 #g-banner legend,
 #g-sidebar legend,
 #g-content #g-search-form legend,
-input[type="hidden"],
-.g-short-form label {
+input[type="hidden"] {
   display: none;
 }
 
@@ -234,19 +237,6 @@ li.g-error select {
   margin-top: 1em;
 }
 
-/* Inline layout (forms, lists) ~~~~~~~~~~ */
-
-.g-short-form li {
-  float: left;
-  padding: .4em 0;
-}
-
-.g-short-form input[type="text"] {
-  color: #666;
-  padding: .3em .6em;
-  width: 11em;
-}
-
 /*** ******************************************************************
  * 3) Page layout containers
  *********************************************************************/
@@ -821,7 +811,6 @@ li.g-error select {
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
-.rtl .g-short-form li,
 .rtl #g-header #g-logo img,
 .rtl #g-content #g-album-grid .g-item,
 .rtl #g-site-menu,
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index e9dd1dd9..0126c36b 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -22,9 +22,10 @@ $(document).ready(function() {
   // Initialize dialogs
   $(".g-dialog-link").gallery_dialog();
 
+  // Initialize short forms
+  $(".g-short-form").gallery_short_form();
+
   // Apply jQuery UI icon, hover, and rounded corner styles
-  $(".g-short-form input[type=text]").addClass("ui-corner-left");
-  $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
   $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
   if ($("#g-view-menu").length) {
     $("#g-view-menu ul").removeClass("g-menu").removeClass("sf-menu");
diff --git a/themes/wind/views/dynamic.html.php b/themes/wind/views/dynamic.html.php
index aa347402..51e48dc0 100644
--- a/themes/wind/views/dynamic.html.php
+++ b/themes/wind/views/dynamic.html.php
@@ -6,7 +6,7 @@
   <h1><?= html::clean($title) ?></h1>
 </div>
 
-<ul id="g-album-grid">
+<ul id="g-album-grid" class="ui-helper-clearfix">
   <? foreach ($children as $i => $child): ?>
   <li class="g-item <?= $child->is_album() ? "g-album" : "" ?>">
     <?= $theme->thumb_top($child) ?>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index c8b08129..f5c6b0df 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -56,7 +56,6 @@
     </script>
     <?= $theme->script("gallery.ajax.js") ?>
     <?= $theme->script("gallery.dialog.js") ?>
-    <?= $theme->script("gallery.form.js") ?>
     <?= $theme->script("superfish/js/superfish.js") ?>
     <?= $theme->script("jquery.localscroll.js") ?>
     <?= $theme->script("ui.init.js") ?>