summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2015-08-28 21:47:26 +0300
committerTeemu Suo-Anttila <teemusa@vaadin.com>2015-11-03 13:45:09 +0200
commitbc78b47d1df883e71aa99082c52502efe4f48a3a (patch)
treec4167c5d61ab4b2a77be0b27720d52c016672c2a /WebContent/VAADIN/themes
parentcbc4c878f8b1964552ffce759cef27708f512215 (diff)
downloadvaadin-framework-bc78b47d1df883e71aa99082c52502efe4f48a3a.tar.gz
vaadin-framework-bc78b47d1df883e71aa99082c52502efe4f48a3a.zip
Force FormLayout children to shrink with the layout (#11154)
The <table> used by the FormLayout doesn't reduce its size if any child component has locked its own size (which is the case with e.g. Table and some other components doing explicit pixel calculations). To work around this, we need to detect the situation, force the <table> to reduce its width by temporarily assigning explicit widths to the cells and then remove the forced size after all children have adjusted. Change-Id: Iacef62979acf24c869a5cbeb82efb0c1e537ec95
Diffstat (limited to 'WebContent/VAADIN/themes')
-rw-r--r--WebContent/VAADIN/themes/base/formlayout/formlayout.scss1
-rw-r--r--WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss1
2 files changed, 2 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/formlayout/formlayout.scss b/WebContent/VAADIN/themes/base/formlayout/formlayout.scss
index a8006fdfe3..2e2a3213f9 100644
--- a/WebContent/VAADIN/themes/base/formlayout/formlayout.scss
+++ b/WebContent/VAADIN/themes/base/formlayout/formlayout.scss
@@ -19,6 +19,7 @@
}
.#{$primaryStyleName}-errorcell, .#{$primaryStyleName}-captioncell {
width: 1px; /* Don't use any extra space */
+ min-width: 1px;
}
.#{$primaryStyleName}-captioncell .v-caption {
overflow: visible;
diff --git a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss
index 51b8a96b60..7f8871fdac 100644
--- a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss
+++ b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss
@@ -2,6 +2,7 @@
.#{$primaryStyleName}-errorcell {
width: 13px;
+ min-width: 13px;
}
.#{$primaryStyleName}-cell .v-errorindicator {
width: 13px;