Merged some changes from 6.5

svn changeset:17798/svn branch:6.6

5 files changed, 29 insertions, 9 deletions

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 6ef3833ce1..0d5e79acbf 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_5_1_dev-20110207";}
-.v-theme-version-6_5_1_dev-20110207 {display: none;}
+.v-theme-version:after {content:"6_5_2_dev-20110303";}
+.v-theme-version-6_5_2_dev-20110303 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1839,6 +1839,10 @@ div.v-progressindicator-indeterminate-disabled {
 	border-bottom: none;
 	position: relative;
 }
+.v-ie6 .v-tabsheet-content,
+.v-ie7 .v-tabsheet-content {
+	zoom: 1;
+}
 .v-tabsheet-deco {
 	height: 1px;
 	background: #aaa;
diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
index b10afd9979..6fae7381a1 100644
--- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
@@ -111,6 +111,10 @@
 	border-bottom: none;
 	position: relative;
 }
+.v-ie6 .v-tabsheet-content,
+.v-ie7 .v-tabsheet-content {
+	zoom: 1;
+}
 .v-tabsheet-deco {
 	height: 1px;
 	background: #aaa;
diff --git a/WebContent/VAADIN/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css
index 5e52105283..115119e797 100644
--- a/WebContent/VAADIN/themes/liferay/styles.css
+++ b/WebContent/VAADIN/themes/liferay/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_5_1_dev-20110207";}
-.v-theme-version-6_5_1_dev-20110207 {display: none;}
+.v-theme-version:after {content:"6_5_2_dev-20110303";}
+.v-theme-version-6_5_2_dev-20110303 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1839,6 +1839,10 @@ div.v-progressindicator-indeterminate-disabled {
 	border-bottom: none;
 	position: relative;
 }
+.v-ie6 .v-tabsheet-content,
+.v-ie7 .v-tabsheet-content {
+	zoom: 1;
+}
 .v-tabsheet-deco {
 	height: 1px;
 	background: #aaa;
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index f82d5574fb..b0c54c8ec4 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_5_1_dev-20110207";}
-.v-theme-version-6_5_1_dev-20110207 {display: none;}
+.v-theme-version:after {content:"6_5_2_dev-20110303";}
+.v-theme-version-6_5_2_dev-20110303 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1839,6 +1839,10 @@ div.v-progressindicator-indeterminate-disabled {
 	border-bottom: none;
 	position: relative;
 }
+.v-ie6 .v-tabsheet-content,
+.v-ie7 .v-tabsheet-content {
+	zoom: 1;
+}
 .v-tabsheet-deco {
 	height: 1px;
 	background: #aaa;
@@ -4467,9 +4471,9 @@ td.v-datefield-calendarpanel-nextyear {
 	-webkit-border-bottom-right-radius: 4px;
 	height: 13px;
 	padding: 4px 30px;
+	white-space: nowrap;
 	color: #222;
 	text-shadow: #fff 0 1px 0;
-	width: 100px;
 	position: relative;
 	top: 1px;
 	-webkit-box-shadow: rgba(0,0,0,.5) 0 1px 2px;
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 47c496d62c..120c4daa53 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_5_1_dev-20110207";}
-.v-theme-version-6_5_1_dev-20110207 {display: none;}
+.v-theme-version:after {content:"6_5_2_dev-20110303";}
+.v-theme-version-6_5_2_dev-20110303 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1839,6 +1839,10 @@ div.v-progressindicator-indeterminate-disabled {
 	border-bottom: none;
 	position: relative;
 }
+.v-ie6 .v-tabsheet-content,
+.v-ie7 .v-tabsheet-content {
+	zoom: 1;
+}
 .v-tabsheet-deco {
 	height: 1px;
 	background: #aaa;