Reverted the margin->padding change in [16247] and fixed the ie7-right-aligned-table-header problem specifically for ie7

svn changeset:16292/svn branch:6.5

5 files changed, 32 insertions, 8 deletions

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 2dc67d1fe3..5c887e43d6 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_0_dev-20101201";}
-.v-theme-version-6_5_0_dev-20101201 {display: none;}
+.v-theme-version:after {content:"6_5_0_dev-20101203";}
+.v-theme-version-6_5_0_dev-20101203 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1525,8 +1525,13 @@ div.v-progressindicator-indeterminate-disabled {
 .v-table-caption-container {
 	overflow: hidden;
 	white-space: nowrap;
+	margin-left: 6px;
+}
+.v-ie7 .v-table-caption-container-align-right {
+	margin-left: 0px;
 	padding-left: 6px;
 }
+
 .v-table-caption-container-align-right {
 	float: right;
 }
diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css
index b41359b2f3..7308cc4a46 100644
--- a/WebContent/VAADIN/themes/base/table/table.css
+++ b/WebContent/VAADIN/themes/base/table/table.css
@@ -91,6 +91,10 @@
 .v-table-caption-container {
 	overflow: hidden;
 	white-space: nowrap;
+	margin-left: 6px;
+}
+.v-ie7 .v-table-caption-container-align-right {
+	margin-left: 0px;
 	padding-left: 6px;
 }
 .v-table-caption-container-align-right {
diff --git a/WebContent/VAADIN/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css
index ec87224117..25c6252f2d 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_0_dev-20101201";}
-.v-theme-version-6_5_0_dev-20101201 {display: none;}
+.v-theme-version:after {content:"6_5_0_dev-20101203";}
+.v-theme-version-6_5_0_dev-20101203 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1525,8 +1525,13 @@ div.v-progressindicator-indeterminate-disabled {
 .v-table-caption-container {
 	overflow: hidden;
 	white-space: nowrap;
+	margin-left: 6px;
+}
+.v-ie7 .v-table-caption-container-align-right {
+	margin-left: 0px;
 	padding-left: 6px;
 }
+
 .v-table-caption-container-align-right {
 	float: right;
 }
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index e94653cb49..db13626cf0 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_0_dev-20101201";}
-.v-theme-version-6_5_0_dev-20101201 {display: none;}
+.v-theme-version:after {content:"6_5_0_dev-20101203";}
+.v-theme-version-6_5_0_dev-20101203 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1525,8 +1525,13 @@ div.v-progressindicator-indeterminate-disabled {
 .v-table-caption-container {
 	overflow: hidden;
 	white-space: nowrap;
+	margin-left: 6px;
+}
+.v-ie7 .v-table-caption-container-align-right {
+	margin-left: 0px;
 	padding-left: 6px;
 }
+
 .v-table-caption-container-align-right {
 	float: right;
 }
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 96921112cb..42d90beb86 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_0_dev-20101201";}
-.v-theme-version-6_5_0_dev-20101201 {display: none;}
+.v-theme-version:after {content:"6_5_0_dev-20101203";}
+.v-theme-version-6_5_0_dev-20101203 {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -1525,8 +1525,13 @@ div.v-progressindicator-indeterminate-disabled {
 .v-table-caption-container {
 	overflow: hidden;
 	white-space: nowrap;
+	margin-left: 6px;
+}
+.v-ie7 .v-table-caption-container-align-right {
+	margin-left: 0px;
 	padding-left: 6px;
 }
+
 .v-table-caption-container-align-right {
 	float: right;
 }