summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN
diff options
context:
space:
mode:
Diffstat (limited to 'WebContent/VAADIN')
-rw-r--r--WebContent/VAADIN/themes/base/layout/layout.scss19
-rw-r--r--WebContent/VAADIN/themes/reindeer/layouts/layouts.scss19
2 files changed, 20 insertions, 18 deletions
diff --git a/WebContent/VAADIN/themes/base/layout/layout.scss b/WebContent/VAADIN/themes/base/layout/layout.scss
index 439510c863..04df35872e 100644
--- 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 24747a56b4..fb47c100f8 100644
--- 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,