#2942 - Dual captions for TwinColSelect

Changed style names to be consistent with server side API
Added test for caption style names

svn changeset:16375/svn branch:6.5

7 files changed, 21 insertions, 12 deletions

diff --git a/WebContent/VAADIN/themes/base/select/select.css b/WebContent/VAADIN/themes/base/select/select.css
index 646c91c7e0..c4247cc0d6 100644
--- a/WebContent/VAADIN/themes/base/select/select.css
+++ b/WebContent/VAADIN/themes/base/select/select.css
@@ -17,7 +17,7 @@
 .v-select-twincol-options {
 	float: left;
 }
-.v-select-twincol-options-caption {
+.v-select-twincol-caption-left {
 	float: left;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -25,7 +25,7 @@
 .v-select-twincol-selections {
 	font-weight: bold;
 }
-.v-select-twincol-selections-caption {
+.v-select-twincol-caption-right {
 	float: right;
 	overflow: hidden;
 	text-overflow: ellipsis;
diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index a28199b791..f56728fcc5 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1107,7 +1107,7 @@ div.v-progressindicator-indeterminate-disabled {
 .v-select-twincol-options {
 	float: left;
 }
-.v-select-twincol-options-caption {
+.v-select-twincol-caption-left {
 	float: left;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -1115,7 +1115,7 @@ div.v-progressindicator-indeterminate-disabled {
 .v-select-twincol-selections {
 	font-weight: bold;
 }
-.v-select-twincol-selections-caption {
+.v-select-twincol-caption-right {
 	float: right;
 	overflow: hidden;
 	text-overflow: ellipsis;
diff --git a/WebContent/VAADIN/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css
index 32310d6a18..0f5eed7a0b 100644
--- a/WebContent/VAADIN/themes/liferay/styles.css
+++ b/WebContent/VAADIN/themes/liferay/styles.css
@@ -1107,7 +1107,7 @@ div.v-progressindicator-indeterminate-disabled {
 .v-select-twincol-options {
 	float: left;
 }
-.v-select-twincol-options-caption {
+.v-select-twincol-caption-left {
 	float: left;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -1115,7 +1115,7 @@ div.v-progressindicator-indeterminate-disabled {
 .v-select-twincol-selections {
 	font-weight: bold;
 }
-.v-select-twincol-selections-caption {
+.v-select-twincol-caption-right {
 	float: right;
 	overflow: hidden;
 	text-overflow: ellipsis;
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index 532bac85e2..0d7c5a7734 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1107,7 +1107,7 @@ div.v-progressindicator-indeterminate-disabled {
 .v-select-twincol-options {
 	float: left;
 }
-.v-select-twincol-options-caption {
+.v-select-twincol-caption-left {
 	float: left;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -1115,7 +1115,7 @@ div.v-progressindicator-indeterminate-disabled {
 .v-select-twincol-selections {
 	font-weight: bold;
 }
-.v-select-twincol-selections-caption {
+.v-select-twincol-caption-right {
 	float: right;
 	overflow: hidden;
 	text-overflow: ellipsis;
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 13e86faf1a..cb2473c5cd 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1107,7 +1107,7 @@ div.v-progressindicator-indeterminate-disabled {
 .v-select-twincol-options {
 	float: left;
 }
-.v-select-twincol-options-caption {
+.v-select-twincol-caption-left {
 	float: left;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -1115,7 +1115,7 @@ div.v-progressindicator-indeterminate-disabled {
 .v-select-twincol-selections {
 	font-weight: bold;
 }
-.v-select-twincol-selections-caption {
+.v-select-twincol-caption-right {
 	float: right;
 	overflow: hidden;
 	text-overflow: ellipsis;
diff --git a/WebContent/VAADIN/themes/tests-tickets/styles.css b/WebContent/VAADIN/themes/tests-tickets/styles.css
index fba6a9b18b..7654f4663f 100644
--- a/WebContent/VAADIN/themes/tests-tickets/styles.css
+++ b/WebContent/VAADIN/themes/tests-tickets/styles.css
@@ -322,4 +322,13 @@
 /*****************************************************************************/
 .v-view { 
 	background: #fff;
-}
\ No newline at end of file
+}
+
+.styled-twincol-captions .v-select-twincol-caption-left {
+	color: red; 
+}
+.styled-twincol-captions .v-select-twincol-caption-right {
+	font-size: 30px;
+	color: blue;
+}
+
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index 480c69be9f..e0bd240f24 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -95,7 +95,7 @@ contains a number of significant enhancements.</p>
 			<pre>.v-table-caption-container</pre> DIV.</li>
 	</ul>
 	<li>TwinColSelect DOM structure has changed slightly to support captions for the left and right column.</li>
-	<li>TwinColSelect now supports .v-select-twincol-options-caption and .v-select-twincol-selections-caption for the left and right captions.</li>
+	<li>TwinColSelect now supports .v-select-twincol-caption-left and .v-select-twincol-caption-right for the left and right captions.</li>
 </ul>
 
 <p>New themeing possibilities:</p>