Extensive refactoring of BoxLayout

Reduced many unnecessary element resize listeners and layout methods.

Refactored ComponentConnector style name handling so that it will now
only alter the style names and not completely override them on each
update.

3 files changed, 21 insertions, 14 deletions

diff --git a/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css b/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css
index 637d829d78..0eb557560e 100644
--- a/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css
+++ b/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.css
@@ -1,5 +1,6 @@
 /* THIS IS HERE ONLY BECAUSE WE WANT TO DEFINE IT FIRST, TO MAKE IT EASY TO OVERRIDE */
-.v-connector {
+/* TODO fix by using a better build script that allows us to define the order of the imports */
+.v {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
diff --git a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css
index 3188d68520..f899e8f4ac 100644
--- a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css
+++ b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css
@@ -20,8 +20,8 @@ TODO
 	display: inline-block;
 }
 
-.v-boxlayout.v-horizontal {
-	white-space: nowrap !important;
+div.v-boxlayout.v-horizontal.v {
+	white-space: nowrap;
 }
 
 .v-boxlayout > .v-expand {
@@ -40,7 +40,7 @@ TODO
 }
 
 /* Clear any floats inside the slot, to prevent unwanted collapsing */
-.v-slot:after {
+.v-vertical > .v-slot:after {
 	content: "";
 	display: inline-block;
 	clear: both;
@@ -88,16 +88,18 @@ TODO
 	white-space: nowrap;
 }
 
-.v-align-middle > .v-connector,
-.v-align-bottom > .v-connector {
+.v-align-middle > .v,
+.v-align-bottom > .v {
 	display: inline-block;
 }
 
-.v-align-middle > .v-connector {
+.v-align-middle,
+.v-align-middle > .v {
 	vertical-align: middle;
 }
 
-.v-align-bottom > .v-connector {
+.v-align-bottom,
+.v-align-bottom > .v {
 	vertical-align: bottom;
 }
 
@@ -105,7 +107,7 @@ TODO
 	text-align: center;
 }
 
-.v-align-center > .v-connector {
+.v-align-center > .v {
 	margin-left: auto;
 	margin-right: auto;
 }
@@ -114,7 +116,7 @@ TODO
 	text-align: right;
 }
 
-.v-align-right > .v-connector {
+.v-align-right > .v {
 	margin-left: auto;
 }
 
@@ -146,17 +148,17 @@ TODO
 	padding-left: .5em;
 }
 
-.v-caption-on-left > .v-connector,
-.v-caption-on-right > .v-connector {
+.v-caption-on-left > .v,
+.v-caption-on-right > .v {
 	display: inline-block;
 	vertical-align: middle;
 }
 
-.v-has-caption.v-has-width > .v-connector {
+.v-has-caption.v-has-width > .v {
 	width: 100% !important;
 }
 
-.v-has-caption.v-has-height > .v-connector {
+.v-has-caption.v-has-height > .v {
 	height: 100% !important;
 }
 
diff --git a/WebContent/VAADIN/themes/base/label/label.css b/WebContent/VAADIN/themes/base/label/label.css
index 366dbdf26f..953584ffd7 100644
--- a/WebContent/VAADIN/themes/base/label/label.css
+++ b/WebContent/VAADIN/themes/base/label/label.css
@@ -1,3 +1,7 @@
 .v-label {
 	overflow: hidden;
+}
+
+.v-label.v-has-width {
+	white-space: normal;
 }
\ No newline at end of file