fix #7281 - fix column resizing for merged cells

[roojs1] / css / form.css

diff --git a/css/form.css b/css/form.css
index 1e3df21..a9dfbc1 100644 (file)
--- a/css/form.css
+++ b/css/form.css
@@ -18,7 +18,9 @@
     position: relative;
     z-index: 2;
 }
-
+.x-form-displayfield { 
+    padding-top: 3px;
+}
 .x-form-label-right label
 {
     text-align: right;
@@ -71,7 +73,10 @@
     padding-top: 2px;
     padding-bottom: 2px;
 }
+/*
+on our demo's this is far to small
 
+*/
 .x-form-item .x-form-text 
 {
      height: 14px; /* need to determine when this should be larger or smaller.. ? */
@@ -84,6 +89,7 @@
 {    
  border: solid 1px black;
 }
+
 .x-form-field-wrap
 {
     position: relative;
@@ -93,7 +99,6 @@
  
 /* gecko specific fix */
 
-}
 .roo-ie .roo-strict .x-form-text,
 .roo-ie .x-form-text
 {
@@ -122,12 +127,12 @@
 
 /** some kind of kludge for the combo demo */
 .roo-gecko .roo-strict .x-form-text {
-    height:16px;
+    height:18px;
 }
 
 .roo-gecko .x-form-item .x-form-text {
     /* the dynamic demo needs 20px */
-    height:20px;
+    height:16px;
 }
 .roo-gecko .x-form-text {
     height:18px;
@@ -157,8 +162,8 @@
 .x-form-invalid
 {
     
-    background: url(../images/default/grid/invalid_line.gif) repeat-x 0 16px;
-    border: 1px solid red;
+    background: #ff0 url(../images/default/grid/invalid_line.gif) repeat-x 0 16px;
+    border: 1px solid red  !important;
 }
 textarea.x-form-invalid
 {
@@ -208,9 +213,10 @@ textarea.x-form-invalid
     padding-left: 12px;
     padding-bottom: 7px;
     margin-bottom:9px;
-    
 }
-
+.roo-ie .x-form fieldset {
+    float: left; /*ie borked */
+}
 .x-form fieldset legend {
     font-weight: bold;