Fixed component caption position inside CssLayout

diff --git a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css
index bbfad98582aecbb48d20a1b4b8115cc66dd144ce..a16b85fc65c8438d6bfe892b5ef9752141ae13b9 100644 (file)
--- a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css
+++ b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css
@@ -120,12 +120,12 @@ TODO
        margin-left: auto;
 }
 
-.v-has-caption {
-       display: inline-block;
+.v-has-caption,
+.v-has-caption > .v-caption {
+       display: inline-block; /* Force natural width to zero */
 }
 
 .v-caption {
-       display: inline-block; /* Force default width to zero */
        overflow: visible;
        vertical-align: middle;
 }