7 files changed, 37 insertions, 187 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index efe6e0cd05..915da19226 100644
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -1,7 +1,7 @@
 @import "absolutelayout/absolutelayout.scss";
 @import "accordion/accordion.scss";
 @import "button/button.scss";
-@import "boxlayout/boxlayout.scss";
+@import "layout/layout.scss";
 @import "caption/caption.scss";
 @import "common/common.scss";
 @import "csslayout/csslayout.scss";
diff --git a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css b/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css
deleted file mode 100644
index f899e8f4ac..0000000000
--- a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.css
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-TODO
-- separate styles to proper places
-- decide a good class name structure for core layouts (e.g. 'v-layout', 'v-vertical', 'v-grid' etc.)
-- use !important in carefully selected places to prevent accidental layout breakage by custom theming (e.g. alignments should be forced)
-
-*/
-
-.v-boxlayout.v-margin-top 		{padding-top: 		12px;}
-.v-boxlayout.v-margin-right 	{padding-right: 	12px;}
-.v-boxlayout.v-margin-bottom 	{padding-bottom: 	12px;}
-.v-boxlayout.v-margin-left 		{padding-left: 		12px;}
-
-.v-spacing {
-	width: 6px;
-	height: 6px;
-}
-
-.v-boxlayout {
-	display: inline-block;
-}
-
-div.v-boxlayout.v-horizontal.v {
-	white-space: nowrap;
-}
-
-.v-boxlayout > .v-expand {
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-	width: 100%;
-	height: 100%;
-}
-
-.v-slot,
-.v-spacing {
-	display: inline-block;
-	white-space: normal;
-	vertical-align: top;
-}
-
-/* Clear any floats inside the slot, to prevent unwanted collapsing */
-.v-vertical > .v-slot:after {
-	content: "";
-	display: inline-block;
-	clear: both;
-	width: 0;
-	height: 0;
-	overflow: hidden;
-}
-
-.v-vertical > .v-slot,
-.v-vertical > .v-expand > .v-slot {
-	display: block;
-	clear: both;
-}
-
-.v-horizontal > .v-slot,
-.v-horizontal > .v-expand > .v-slot {
-	height: 100%;
-}
-
-.v-vertical > .v-spacing,
-.v-vertical > .v-expand > .v-spacing {
-	width: 0;
-	display: block;
-	clear: both;
-}
-
-.v-horizontal > .v-spacing,
-.v-horizontal > .v-expand > .v-spacing {
-	height: 0;
-}
-
-.v-align-middle:before,
-.v-align-bottom:before,
-.v-expand > .v-align-middle:before,
-.v-expand > .v-align-bottom:before {
-	content: "";
-	display: inline-block;
-	height: 100%;
-	vertical-align: middle;
-	width: 0;
-}
-
-.v-align-middle,
-.v-align-bottom {
-	white-space: nowrap;
-}
-
-.v-align-middle > .v,
-.v-align-bottom > .v {
-	display: inline-block;
-}
-
-.v-align-middle,
-.v-align-middle > .v {
-	vertical-align: middle;
-}
-
-.v-align-bottom,
-.v-align-bottom > .v {
-	vertical-align: bottom;
-}
-
-.v-align-center {
-	text-align: center;
-}
-
-.v-align-center > .v {
-	margin-left: auto;
-	margin-right: auto;
-}
-
-.v-align-right {
-	text-align: right;
-}
-
-.v-align-right > .v {
-	margin-left: auto;
-}
-
-.v-has-caption,
-.v-has-caption > .v-caption {
-	display: inline-block; /* Force natural width to zero */
-}
-
-.v-caption {
-	overflow: visible;
-	vertical-align: middle;
-}
-
-.v-caption-on-left,
-.v-caption-on-right {
-	white-space: nowrap;
-}
-
-.v-caption-on-top > .v-caption,
-.v-caption-on-bottom > .v-caption {
-	display: block;
-}
-
-.v-caption-on-left > .v-caption {
-	padding-right: .5em;
-}
-
-.v-caption-on-right > .v-caption {
-	padding-left: .5em;
-}
-
-.v-caption-on-left > .v,
-.v-caption-on-right > .v {
-	display: inline-block;
-	vertical-align: middle;
-}
-
-.v-has-caption.v-has-width > .v {
-	width: 100% !important;
-}
-
-.v-has-caption.v-has-height > .v {
-	height: 100% !important;
-}
-
-.v-errorindicator {
-	vertical-align: middle;
-}
-\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.scss b/WebContent/VAADIN/themes/base/layout/layout.scss
index 92e0eb415d..af49dd4463 100644
--- a/WebContent/VAADIN/themes/base/boxlayout/boxlayout.scss
+++ b/WebContent/VAADIN/themes/base/layout/layout.scss
@@ -6,27 +6,44 @@ TODO
 
 */
 
-@mixin base-boxlayout {
+@mixin base-layout {
 
-.v-boxlayout.v-margin-top 		{padding-top: 		12px;}
-.v-boxlayout.v-margin-right 	{padding-right: 	12px;}
-.v-boxlayout.v-margin-bottom 	{padding-bottom: 	12px;}
-.v-boxlayout.v-margin-left 		{padding-left: 		12px;}
+.v-vertical.v-margin-top,
+.v-horizontal.v-margin-top {
+	padding-top: 12px;
+}
+
+.v-vertical.v-margin-right,
+.v-horizontal.v-margin-right	{
+	padding-right: 	12px;
+}
+
+.v-vertical.v-margin-bottom,
+.v-horizontal.v-margin-bottom {
+	padding-bottom: 12px;
+}
+
+.v-layout.v-vertical.v-margin-left,
+.v-layout.v-horizontal.v-margin-left {
+	padding-left: 12px;
+}
 
 .v-spacing {
 	width: 6px;
 	height: 6px;
 }
 
-.v-boxlayout {
+.v-vertical,
+.v-horizontal {
 	display: inline-block;
 }
 
-div.v-boxlayout.v-horizontal.v-widget {
+div.v-layout.v-horizontal.v-widget {
 	white-space: nowrap;
 }
 
-.v-boxlayout > .v-expand {
+.v-layout.v-vertical > .v-expand,
+.v-layout.v-horizontal > .v-expand {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
diff --git a/WebContent/VAADIN/themes/base/styles.scss b/WebContent/VAADIN/themes/base/styles.scss
index 7a650d0818..ed37d3cc80 100644
--- a/WebContent/VAADIN/themes/base/styles.scss
+++ b/WebContent/VAADIN/themes/base/styles.scss
@@ -15,7 +15,7 @@
 // here for now to preserve old semantics
 @include base-common;
 
-@include base-boxlayout;
+@include base-layout;
 @include base-csslayout;
 @include base-customcomponent;
 @include base-customlayout;
diff --git a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
index e1bef65f1e..c0204ec041 100644
--- a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
+++ b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
@@ -3,25 +3,25 @@
 .v-orderedlayout-margin-top,
 .v-horizontallayout-margin-top,
 .v-verticallayout-margin-top,
-.v-boxlayout.v-margin-top {
+.v-layout.v-margin-top {
 	padding-top: 18px;
 }
 .v-orderedlayout-margin-right,
 .v-horizontallayout-margin-right,
 .v-verticallayout-margin-right,
-.v-boxlayout.v-margin-right {
+.v-layout.v-margin-right {
 	padding-right: 18px;
 }
 .v-orderedlayout-margin-bottom,
 .v-horizontallayout-margin-bottom,
 .v-verticallayout-margin-bottom,
-.v-boxlayout.v-margin-bottom {
+.v-layout.v-margin-bottom {
 	padding-bottom: 18px;
 }
 .v-orderedlayout-margin-left,
 .v-horizontallayout-margin-left,
 .v-verticallayout-margin-left,
-.v-boxlayout.v-margin-left {
+.v-layout.v-margin-left {
 	padding-left: 18px;
 }
 .v-orderedlayout-spacing-on,
diff --git a/WebContent/VAADIN/themes/runo/orderedlayout/orderedlayout.scss b/WebContent/VAADIN/themes/runo/orderedlayout/orderedlayout.scss
index 37ae0279b6..8799c7d8a6 100644
--- a/WebContent/VAADIN/themes/runo/orderedlayout/orderedlayout.scss
+++ b/WebContent/VAADIN/themes/runo/orderedlayout/orderedlayout.scss
@@ -4,28 +4,28 @@
 .v-horizontallayout-margin-top,
 .v-verticallayout-margin-top,
 .v-csslayout-margin-top,
-.v-boxlayout.v-margin-top {
+.v-layout.v-margin-top {
 	padding-top: 15px;
 }
 .v-orderedlayout-margin-right,
 .v-horizontallayout-margin-right,
 .v-verticallayout-margin-right,
 .v-csslayout-margin-right,
-.v-boxlayout.v-margin-right {
+.v-layout.v-margin-right {
 	padding-right: 18px;
 }
 .v-orderedlayout-margin-bottom,
 .v-horizontallayout-margin-bottom,
 .v-verticallayout-margin-bottom,
 .v-csslayout-margin-bottom,
-.v-boxlayout.v-margin-bottom {
+.v-layout.v-margin-bottom {
 	padding-bottom: 15px;
 }
 .v-orderedlayout-margin-left,
 .v-horizontallayout-margin-left,
 .v-verticallayout-margin-left,
 .v-csslayout-margin-left,
-.v-boxlayout.v-margin-left {
+.v-layout.v-margin-left {
 	padding-left: 18px;
 }
 .v-orderedlayout-spacing-on,
diff --git a/WebContent/VAADIN/themes/tests-components/styles.css b/WebContent/VAADIN/themes/tests-components/styles.css
index 45a96b6d16..2d54a48124 100644
--- a/WebContent/VAADIN/themes/tests-components/styles.css
+++ b/WebContent/VAADIN/themes/tests-components/styles.css
@@ -38,11 +38,11 @@
 	background: #f00;
 }
 
-.v-boxlayout.test {
+.v-layout.test {
 	border: 1px solid #ddd;
 }
 
-.v-boxlayout.test .target {
+.v-layout.test .target {
 	outline: 2px dashed blue;
 }