VForm theme modified, fieldset now doesn't have a border if there is no caption for...

svn changeset:10116/svn branch:6.2

diff --git a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css
index d3aa7d46d1da017ffd19c7aa81fc01e6d97c0ccd..9f865c3484dc0651eda803c96d1f0c42d1242339 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css
+++ b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css
@@ -50,8 +50,14 @@
        border: none;
        border-top: 1px solid #babfc0;
 }
+.v-form-nocaption fieldset {
+       border: none;
+}
+.v-form-nocaption legend {
+       display: none;
+}
 .v-form legend {
-       margin: 0;
-       padding: 0 4px 0.3em 4px;
+       margin: 0 0 0 20px;
+       padding: 0 5px;
        font-weight: bold;
 }
\ No newline at end of file

diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index eb803d6f1f6e67170b244b028784bb066cfb5d58..ba50ed40be5e7b6e13e2a745d5c8ac63befe0220 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -2927,9 +2927,15 @@ td.v-datefield-calendarpanel-nextyear {
        border: none;
        border-top: 1px solid #babfc0;
 }
+.v-form-nocaption fieldset {
+       border: none;
+}
+.v-form-nocaption legend {
+       display: none;
+}
 .v-form legend {
-       margin: 0;
-       padding: 0 4px 0.3em 4px;
+       margin: 0 0 0 20px;
+       padding: 0 5px;
        font-weight: bold;
 }
 

diff --git a/WebContent/VAADIN/themes/runo/formlayout/formlayout.css b/WebContent/VAADIN/themes/runo/formlayout/formlayout.css
index 4c773b2e6ebe25b23f785bd3e0595d8185ca8266..e2fde59fe28fc19144b59ba14f3555d3abd051cd 100644 (file)
--- a/WebContent/VAADIN/themes/runo/formlayout/formlayout.css
+++ b/WebContent/VAADIN/themes/runo/formlayout/formlayout.css
@@ -43,6 +43,12 @@
        border: none;
        border-top: 1px solid #babfc0;
 }
+.v-form-nocaption fieldset {
+       border: none;
+}
+.v-form-nocaption legend {
+       display: none;
+}
 .v-form legend {
        margin: 0;
        padding: 0 4px 0.3em 4px;

diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index c3bdf48d4f5a130173d86168ba713c252e2a69b2..67aacb6f4529033f5d65fc7f14bd166efcec7762 100644 (file)
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -2174,6 +2174,12 @@ div.v-tree-node-leaf {
        border: none;
        border-top: 1px solid #babfc0;
 }
+.v-form-nocaption fieldset {
+       border: none;
+}
+.v-form-nocaption legend {
+       display: none;
+}
 .v-form legend {
        margin: 0;
        padding: 0 4px 0.3em 4px;

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VForm.java b/src/com/vaadin/terminal/gwt/client/ui/VForm.java
index 7117d2cebff60982cdcbb77fd6b9282efb3d25b3..01e6caae0d3b02b2d18a5a8368152ff7eef4cae9 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VForm.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VForm.java
@@ -100,9 +100,9 @@ public class VForm extends ComplexPanel implements Container {
             }\r
         }\r
         if (legendEmpty) {\r
-            DOM.setStyleAttribute(legend, "display", "none");\r
+            addStyleDependentName("nocaption");\r
         } else {\r
-            DOM.setStyleAttribute(legend, "display", "");\r
+            removeStyleDependentName("nocaption");\r
         }\r
 \r
         if (uidl.hasAttribute("error")) {\r