From 4f26b843bac9d97720ab0a9743e704741335cbc6 Mon Sep 17 00:00:00 2001
From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Wed, 10 Feb 2010 12:37:35 +0000
Subject: [PATCH] Changed base theme layout margins and spacings from ems to
 pixels (reduce layout calculations, no conversion needed in the browser).

svn changeset:11248/svn branch:6.3
---
 .../VAADIN/themes/base/csslayout/csslayout.css       | 11 +++++------
 .../VAADIN/themes/base/formlayout/formlayout.css     | 10 +++++-----
 .../VAADIN/themes/base/gridlayout/gridlayout.css     | 12 ++++++------
 .../themes/base/orderedlayout/orderedlayout.css      | 12 ++++++------
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/WebContent/VAADIN/themes/base/csslayout/csslayout.css b/WebContent/VAADIN/themes/base/csslayout/csslayout.css
index 12f1cd08fc..1f85d6f460 100644
--- a/WebContent/VAADIN/themes/base/csslayout/csslayout.css
+++ b/WebContent/VAADIN/themes/base/csslayout/csslayout.css
@@ -1,16 +1,15 @@
 .v-csslayout {
 	overflow: hidden;
 }
-
 .v-csslayout-margin-top {
-	padding-top: 2em;	
+	padding-top: 12px;	
 }
 .v-csslayout-margin-bottom {
-	padding-bottom: 2em;	
+	padding-bottom: 12px;	
 }
 .v-csslayout-margin-left {
-	padding-left: 2em;	
+	padding-left: 12px;	
 }
 .v-csslayout-margin-right {
-	padding-right: 2em;	
-}
+	padding-right: 12px;	
+}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/formlayout/formlayout.css b/WebContent/VAADIN/themes/base/formlayout/formlayout.css
index 47ae45df52..9566ff1663 100644
--- a/WebContent/VAADIN/themes/base/formlayout/formlayout.css
+++ b/WebContent/VAADIN/themes/base/formlayout/formlayout.css
@@ -15,7 +15,7 @@
 .v-formlayout-spacing .v-formlayout-row .v-formlayout-captioncell, 
 .v-formlayout-spacing .v-formlayout-row .v-formlayout-contentcell,
 .v-formlayout-spacing .v-formlayout-row .v-formlayout-errorcell {
-	padding-top: 1em;
+	padding-top: 6px;
 }
 .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-captioncell, 
 .v-formlayout-spacing .v-formlayout-firstrow .v-formlayout-contentcell,
@@ -25,18 +25,18 @@
 .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-captioncell, 
 .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-contentcell,
 .v-formlayout-margin-top .v-formlayout-firstrow .v-formlayout-errorcell {
-	padding-top: 2em;
+	padding-top: 12px;
 }
 .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-captioncell,
 .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-contentcell,
 .v-formlayout-margin-bottom .v-formlayout-lastrow .v-formlayout-errorcell {
-	padding-bottom: 2em;
+	padding-bottom: 12px;
 }
 .v-formlayout-margin-left .v-formlayout-captioncell {
-	padding-left: 2em;
+	padding-left: 12px;
 } 
 .v-formlayout-margin-right .v-formlayout-contentcell {
-	padding-right: 2em;
+	padding-right: 12px;
 }
 .v-formlayout-captioncell .v-caption .v-required-field-indicator {
 	float: none;
diff --git a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css
index 039f080ac2..87cdcfd361 100644
--- a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css
+++ b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css
@@ -1,18 +1,18 @@
 .v-gridlayout-margin-top {
-	padding-top: 2em;
+	padding-top: 12px;
 }
 .v-gridlayout-margin-bottom {
-	padding-bottom: 2em;
+	padding-bottom: 12px;
 }
 .v-gridlayout-margin-left {
-	padding-left: 2em;
+	padding-left: 12px;
 } 
 .v-gridlayout-margin-right {
-	padding-right: 2em;
+	padding-right: 12px;
 }
 .v-gridlayout-spacing-on {
-	padding-left: 1em;
-	padding-top: 1em;
+	padding-left: 6px;
+	padding-top: 6px;
 	overflow: hidden;
 }
 .v-gridlayout-spacing,
diff --git a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css
index 6dafa2d252..9f91669385 100644
--- a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css
+++ b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css
@@ -1,28 +1,28 @@
 .v-orderedlayout-margin-top,
 .v-horizontallayout-margin-top,
 .v-verticallayout-margin-top {
-	padding-top: 2em;
+	padding-top: 12px;
 }
 .v-orderedlayout-margin-right,
 .v-horizontallayout-margin-right,
 .v-verticallayout-margin-right {
-	padding-right: 2em;
+	padding-right: 12px;
 }
 .v-orderedlayout-margin-bottom,
 .v-horizontallayout-margin-bottom,
 .v-verticallayout-margin-bottom {
-	padding-bottom: 2em;
+	padding-bottom: 12px;
 }
 .v-orderedlayout-margin-left,
 .v-horizontallayout-margin-left,
 .v-verticallayout-margin-left {
-	padding-left: 2em;
+	padding-left: 12px;
 }
 .v-orderedlayout-spacing-on,
 .v-horizontallayout-spacing-on,
 .v-verticallayout-spacing-on {
-	padding-top: 1em;
-	padding-left: 1em;
+	padding-top: 6px;
+	padding-left: 6px;
 }
 /* This can be used to define spacing if spacing is off server side */
 .v-orderedlayout-spacing-off,
-- 
2.39.5