Moved grid layout margin and spacing fixes from reindeer to base theme #9559

diff --git a/WebContent/VAADIN/themes/base/layout/layout.scss b/WebContent/VAADIN/themes/base/layout/layout.scss
index 439510c863c321c974b4e10316c93cbc1cccafbf..04df35872ecebbc0988b2c6fedaa878a52aff612 100644 (file)
--- a/WebContent/VAADIN/themes/base/layout/layout.scss
+++ b/WebContent/VAADIN/themes/base/layout/layout.scss
@@ -28,6 +28,25 @@ TODO
        padding-left: 12px;
 }
 
+/* Different for historical reasons: previously was inherited directly from Base theme */
+/* TODO unify these values in version 7 */
+.v-gridlayout.v-layout-margin-top {
+       padding-top: 24px;
+}
+.v-gridlayout.v-layout-margin-bottom {
+       padding-bottom: 24px;
+}
+.v-gridlayout.v-layout-margin-left {
+       padding-left: 24px;
+} 
+.v-gridlayout.v-layout-margin-right {
+       padding-right: 24px;
+}
+.v-gridlayout .v-layout-spacing-on {
+       padding-left: 12px;
+       padding-top: 12px;
+}
+
 .v-spacing {
        width: 6px;
        height: 6px;

diff --git a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
index 24747a56b40ec2f5e9391edaeaa5c4e68d271f9f..fb47c100f8775fca0f875610370bb18ba9eae767 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
+++ b/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
@@ -34,24 +34,7 @@
        height: 7px;
        width: 6px;
 }
-/* Different for historical reasons: previously was inherited directly from Base theme */
-/* TODO unify these values in version 7 */
-.v-gridlayout.v-layout-margin-top {
-       padding-top: 24px;
-}
-.v-gridlayout.v-layout-margin-bottom {
-       padding-bottom: 24px;
-}
-.v-gridlayout.v-layout-margin-left {
-       padding-left: 24px;
-} 
-.v-gridlayout.v-layout-margin-right {
-       padding-right: 24px;
-}
-.v-gridlayout .v-layout-spacing-on {
-       padding-left: 12px;
-       padding-top: 12px;
-}
+
 /* Blue background */
 .v-verticallayout-blue,
 .v-horizontallayout-blue,