merged changes from 6.3 + some container related changes

svn changeset:11664/svn branch:6.3_dd

1 files changed, 54 insertions, 24 deletions

diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index c2df4128e4..60451c64c7 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_3_0_dev-20100304";}
-.v-theme-version-6_3_0_dev-20100304 {display: none;}
+.v-theme-version:after {content:"6_3_0_dev-20100305";}
+.v-theme-version-6_3_0_dev-20100305 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -484,18 +484,17 @@ div.v-app-loading {
 .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;	
 }
 
 .v-customcomponent {
@@ -559,6 +558,9 @@ div.v-app-loading {
 .v-datefield-time .v-label {
 	display: inline;
 }
+.v-datefield-popup {
+	background: #fff;
+}
 /* Disabled by default
 .v-datefield-error .v-textfield,
 .v-datefield-error .v-datefield-calendarpanel {
@@ -598,7 +600,7 @@ div.v-app-loading {
 .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,
@@ -608,38 +610,38 @@ div.v-app-loading {
 .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;
 }
 
 .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,
@@ -796,28 +798,28 @@ div.v-app-loading {
 .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,
@@ -1339,6 +1341,10 @@ div.v-progressindicator-indeterminate-disabled {
 .v-table-header-cell-desc .v-table-caption-container {
 	background: transparent url(../base/common/img/sprites.png) no-repeat right -10px;
 }
+.v-table-caption-container .v-icon,
+.v-table-header-drag .v-icon {
+	vertical-align: middle;
+}
 .v-table-body {
 	border: 1px solid #aaa;
 }
@@ -1403,6 +1409,9 @@ div.v-progressindicator-indeterminate-disabled {
 	margin-top: 20px;
 	z-index: 30000;
 }
+.v-table-header-drag .v-icon {
+	vertical-align: middle;
+}
 .v-table-scrollposition {
 	width: 160px;
 	background: #eee;
@@ -1694,7 +1703,10 @@ div.v-tree-node-leaf {
 	right: 0;
 	height: 21px;
 	text-align: right;
+	border: none;
+	background: transparent;
 }
+
 .v-upload-immediate button {
 	position: relative;
 	left: 0;
@@ -3133,6 +3145,24 @@ td.v-datefield-calendarpanel-nextyear {
 	padding-top: 7px;
 	padding-left: 6px;
 }
+/* Different for historical reasons: previously was inherited directly from Base theme */
+/* TODO unify these values in version 7 */
+.v-gridlayout-margin-top {
+	padding-top: 24px;
+}
+.v-gridlayout-margin-bottom {
+	padding-bottom: 24px;
+}
+.v-gridlayout-margin-left {
+	padding-left: 24px;
+} 
+.v-gridlayout-margin-right {
+	padding-right: 24px;
+}
+.v-gridlayout-spacing-on {
+	padding-left: 12px;
+	padding-top: 12px;
+}
 /* Blue background */
 .v-verticallayout-blue,
 .v-horizontallayout-blue,