Merge branch 'master' of git://github.com/gallery/gallery3

2 files changed, 12 insertions, 4 deletions

diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index f9ef18c7..6b0c3fe5 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -77,9 +77,11 @@
       </div>
       <div id="g-footer" class="g-inline ui-helper-clearfix">
         <?= $theme->admin_footer() ?>
-        <div>
+        <? if (module::get_var("gallery", "show_credits")): ?>
+        <ul id="g-credits" class="g-inline">
           <?= $theme->admin_credits() ?>
-        </div>
+        </ul>
+        <? endif ?>
       </div>
     </div>
     <?= $theme->admin_page_bottom() ?>
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index ac100da4..0633ff07 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -1,5 +1,5 @@
 /**
- * Fix display in IE 6, 7
+ * Fix display in IE 6, 7, and 8
  */
 
 #g-banner {
@@ -26,11 +26,17 @@ input.submit {
   display: inline !important;
 }
 
-.g-short-form input[type='submit'] {
+.g-short-form input.text,
+.g-short-form input.submit {
+  font-size: 1em;
   line-height: 1em;
   padding: .38em .3em;
 }
 
+#g-search-form input#q {
+  width: 300px;
+}
+
 #g-add-tag-form input.textbox {
   width: 110px !important;
 }