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

2 files changed, 32 insertions, 4 deletions

diff --git a/modules/organize/vendor/ext/css/ext-all.css b/modules/organize/vendor/ext/css/ext-all.css
index afef9809..38dff3e0 100644
--- a/modules/organize/vendor/ext/css/ext-all.css
+++ b/modules/organize/vendor/ext/css/ext-all.css
@@ -1,6 +1,6 @@
 /*!
- * Ext JS Library 3.3.1
- * Copyright(c) 2006-2010 Sencha Inc.
+ * Ext JS Library 3.4.0
+ * Copyright(c) 2006-2011 Sencha Inc.
  * licensing@sencha.com
  * http://www.sencha.com/license
  */
@@ -906,6 +906,22 @@ textarea.x-form-field {
     line-height:18px;
 }
 
+.x-quirks .ext-ie9 .x-form-text {
+    height: 22px;
+    padding-top: 3px;
+    padding-bottom: 0px;
+}
+
+/* Ugly hacks for the bogus 1px margin bug in IE9 quirks */
+.x-quirks .ext-ie9 .x-input-wrapper .x-form-text,
+.x-quirks .ext-ie9 .x-form-field-trigger-wrap .x-form-text {
+    margin-top: -1px;
+    margin-bottom: -1px;
+}
+.x-quirks .ext-ie9 .x-input-wrapper .x-form-element {
+    margin-bottom: -1px;
+}
+
 .ext-ie6 .x-form-field-wrap .x-form-file-btn, .ext-ie7 .x-form-field-wrap .x-form-file-btn {
     top: -1px; /* because of all these margin hacks, these buttons are off by one pixel in IE6,7 */
 }
@@ -1198,6 +1214,10 @@ textarea {
 
 .ext-webkit .x-small-editor .x-form-text{padding-top:3px;font-size:100%;}
 
+.ext-strict .ext-webkit .x-small-editor .x-form-text{
+    height:14px !important;
+}
+
 .x-form-clear {
     clear:both;
     height:0;
@@ -1341,6 +1361,10 @@ textarea {
     margin-bottom:10px;
 }
 
+.ext-strict .ext-ie9 .x-fieldset legend.x-fieldset-header {
+    padding-top: 1px;
+}
+
 .ext-ie .x-fieldset {
     padding-top: 0;
     padding-bottom:10px;
diff --git a/modules/organize/vendor/ext/css/ux-all.css b/modules/organize/vendor/ext/css/ux-all.css
index 42943be7..f8c88d83 100644
--- a/modules/organize/vendor/ext/css/ux-all.css
+++ b/modules/organize/vendor/ext/css/ux-all.css
@@ -1,6 +1,6 @@
 /*!
- * Ext JS Library 3.3.1
- * Copyright(c) 2006-2010 Sencha Inc.
+ * Ext JS Library 3.4.0
+ * Copyright(c) 2006-2011 Sencha Inc.
  * licensing@sencha.com
  * http://www.sencha.com/license
  */
@@ -455,6 +455,10 @@ li.x-menu-list-item div {
 .x-view-drag-insert-below { 
     border-bottom:1px dotted #3366cc; 
 } 
+
+.ext-ie .ux-form-multiselect .x-fieldset legend {
+    margin-bottom: 0;
+}
 .x-panel-resize {
         height:5px;
         background:transparent url(../images/panel-handle.gif) no-repeat center bottom;