Avoid captions wrapping over multiple rows (#8313)

diff --git a/WebContent/VAADIN/themes/base/caption/caption.css b/WebContent/VAADIN/themes/base/caption/caption.css
index 549d4f9cef938f236dbeb54d5814573575cf0570..364b68a2266ce4e02efd19be32a1a9f58511a5b2 100644 (file)
--- a/WebContent/VAADIN/themes/base/caption/caption.css
+++ b/WebContent/VAADIN/themes/base/caption/caption.css
@@ -6,32 +6,18 @@
        white-space: nowrap;
 }
 .v-errorindicator {
-       float: left;
+       display: inline-block;
 }
 .v-caption .v-icon {
-       float: left;
+       display: inline-block;
        padding-right: 2px;
        vertical-align: middle;
 }
 .v-caption .v-captiontext {
-       float: left;
+       display: inline-block;
        overflow: hidden;
        vertical-align: middle;
 }
 .v-caption .v-required-field-indicator {
-       float: left;
+       display: inline-block;
 }
-
-.v-caption-clearelem {
-       clear: both;
-       width: 0;
-       height: 0;
-       overflow: hidden;
-}
-
-.v-ie9 .v-gridlayout-margin>div>div>.v-caption,
-.v-ie9 .v-verticallayout>div>div>.v-caption,
-.v-ie9 .v-horizontallayout>div>div>.v-caption {
-       /* Fix possible sub pixel rounding errors that cause error indicators to drop */
-       margin-right:-0.5px;
-}
\ No newline at end of file

diff --git a/src/com/vaadin/terminal/gwt/client/VCaption.java b/src/com/vaadin/terminal/gwt/client/VCaption.java
index f6d8ffe58e103704b9c9eb1044a71c6ea6e1cf6c..286d3fc17f9370e719523044d416fe493d79bd11 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/VCaption.java
+++ b/src/com/vaadin/terminal/gwt/client/VCaption.java
@@ -24,8 +24,6 @@ public class VCaption extends HTML {
 
     private Element captionText;
 
-    private Element clearElement;
-
     private final ApplicationConnection client;
 
     private boolean placedAfterComponent = false;
@@ -39,8 +37,6 @@ public class VCaption extends HTML {
     protected static final String ATTRIBUTE_ERROR = "error";
     protected static final String ATTRIBUTE_HIDEERRORS = "hideErrors";
 
-    private static final String CLASSNAME_CLEAR = CLASSNAME + "-clearelem";
-
     /**
      * 
      * @param component
@@ -196,12 +192,6 @@ public class VCaption extends HTML {
             errorIndicatorElement = null;
         }
 
-        if (clearElement == null) {
-            clearElement = DOM.createDiv();
-            clearElement.setClassName(CLASSNAME_CLEAR);
-            getElement().appendChild(clearElement);
-        }
-
         return (wasPlacedAfterComponent != placedAfterComponent);
     }