aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2008-11-10 13:56:11 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2008-11-10 13:56:11 +0000
commit0191f9fdefca58494e17502de447cd92bd6e8cf5 (patch)
treee204197d32a0c5f6d39206c28c1016ddfb40e7dc
parentfd9a03c8b88f5f969b7978959b1d68f82f11dec3 (diff)
downloadvaadin-framework-0191f9fdefca58494e17502de447cd92bd6e8cf5.tar.gz
vaadin-framework-0191f9fdefca58494e17502de447cd92bd6e8cf5.zip
formlayout now reservers space for error indicator even though nothing is visible
svn changeset:5848/svn branch:trunk
-rw-r--r--WebContent/ITMILL/themes/default/formlayout/formlayout.css10
-rw-r--r--WebContent/ITMILL/themes/default/styles.css9
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java3
3 files changed, 21 insertions, 1 deletions
diff --git a/WebContent/ITMILL/themes/default/formlayout/formlayout.css b/WebContent/ITMILL/themes/default/formlayout/formlayout.css
index b795e5c8ea..da6f864210 100644
--- a/WebContent/ITMILL/themes/default/formlayout/formlayout.css
+++ b/WebContent/ITMILL/themes/default/formlayout/formlayout.css
@@ -6,6 +6,16 @@
}
.i-formlayout-captioncell {
text-align:right;
+ white-space: nowrap;
+}
+
+.i-formlayout-contentcell {
+ width:100%;
+}
+
+.i-formlayout-error-indicator {
+ /* fix width so layout is not jumpy when error disapear */
+ width: 12px;
}
.i-formlayout-spacing .i-formlayout-row .i-formlayout-captioncell,
diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index 0ea9b65850..45a1f86231 100644
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -655,6 +655,15 @@ input.i-modified,
}
.i-formlayout-captioncell {
text-align:right;
+ white-space: nowrap;
+}
+
+.i-formlayout-contentcell {
+ width:100%;
+}
+
+.i-formlayout-error-indicator {
+ width: 12px;
}
.i-formlayout-spacing .i-formlayout-row .i-formlayout-captioncell,
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
index f856f4a23c..6a7f32f777 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
@@ -270,7 +270,8 @@ public class IFormLayout extends FlexTable implements Container {
}
private class ErrorFlag extends HTML {
- private static final String CLASSNAME = ".i-form-layout-error-indicator";
+ private static final String CLASSNAME = IFormLayout.CLASSNAME
+ + "-error-indicator";
Element errorIndicatorElement;
private Paintable owner;