Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 29 insertions, 0 deletions

diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
new file mode 100644
index 00000000..fcebeea8
--- /dev/null
+++ b/themes/wind/css/fix-ie.css
@@ -0,0 +1,29 @@
+/**
+ * Fix display in IE 6, 7
+ */
+
+#g-banner {
+  z-index: 2;
+}
+
+input.submit {
+  clear: none !important;
+  display: inline !important;
+}
+
+#g-add-tag-form input.textbox {
+  width: 110px;
+}
+
+#g-dialog .g-cancel {
+  display: inline-block !important;
+  float: none !important;
+}
+
+.g-pager .g-text-right {
+  width: 29%;
+}
+
+.g-pager .ui-icon-right {
+  width: 60px;
+}