Fixes ##2972: Create theme selector for Sampler

svn changeset:8665/svn branch:6.1

9 files changed, 46 insertions, 9 deletions

diff --git a/WebContent/VAADIN/themes/runo/button/button.css b/WebContent/VAADIN/themes/runo/button/button.css
index 53762a03df..230d49912f 100644
--- a/WebContent/VAADIN/themes/runo/button/button.css
+++ b/WebContent/VAADIN/themes/runo/button/button.css
@@ -33,7 +33,8 @@
 

 /* Small style */

 

-.v-button-small {

+.v-button-small,

+.v-disabled.v-button-small {

 	font-size: 11px;

 	line-height: 14px;

 	padding: 1px 15px;

@@ -42,7 +43,8 @@
 

 

 /* Link style */

-.v-button-link {

+.v-button-link,

+.v-disabled.v-button-link {

 	border: none;

 	background: transparent;

 	padding: 0;

diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 739d089c85..0c70ca98f4 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1740,7 +1740,8 @@ div.v-tree-node-leaf {
 
 /* Small style */
 
-.v-button-small {
+.v-button-small,
+.v-disabled.v-button-small {
 	font-size: 11px;
 	line-height: 14px;
 	padding: 1px 15px;
@@ -1749,7 +1750,8 @@ div.v-tree-node-leaf {
 
 
 /* Link style */
-.v-button-link {
+.v-button-link,
+.v-disabled.v-button-link {
 	border: none;
 	background: transparent;
 	padding: 0;
diff --git a/WebContent/VAADIN/themes/sampler-reindeer/styles.css b/WebContent/VAADIN/themes/sampler-reindeer/styles.css
new file mode 100644
index 0000000000..c3c4ff1678
--- /dev/null
+++ b/WebContent/VAADIN/themes/sampler-reindeer/styles.css
@@ -0,0 +1,3 @@
+@import url(../reindeer/styles.css);
+
+@import url(../sampler/styles.css);
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/sampler-runo/styles.css b/WebContent/VAADIN/themes/sampler-runo/styles.css
new file mode 100644
index 0000000000..f5c19e4115
--- /dev/null
+++ b/WebContent/VAADIN/themes/sampler-runo/styles.css
@@ -0,0 +1,3 @@
+@import url(../runo/styles.css);
+
+@import url(../sampler/styles.css);
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/sampler/layouts/examplecustomlayout.html b/WebContent/VAADIN/themes/sampler/layouts/examplecustomlayout.html
index 1e139a6c9c..0d2af150c5 100644
--- a/WebContent/VAADIN/themes/sampler/layouts/examplecustomlayout.html
+++ b/WebContent/VAADIN/themes/sampler/layouts/examplecustomlayout.html
@@ -30,7 +30,7 @@
 	</tr>

 	<tr>

 		<td colspan="2" style="padding: 7px; background-color: #4172AE">

-		<IMG align="absbottom" src="../icons/icon_info.gif" /> This

+		<img align="absbottom" src="../../sampler/icons/icon_info.gif" /> This

 		information is in the layout.

 		<td>

 	</tr>

diff --git a/WebContent/VAADIN/themes/sampler/sampler/palette.png b/WebContent/VAADIN/themes/sampler/sampler/palette.png
new file mode 100644
index 0000000000..dc67427b26
--- /dev/null
+++ b/WebContent/VAADIN/themes/sampler/sampler/palette.png
diff --git a/WebContent/VAADIN/themes/sampler/sampler/segment.png b/WebContent/VAADIN/themes/sampler/sampler/segment.png
index a2f5049589..5896cb8fc5 100644
--- a/WebContent/VAADIN/themes/sampler/sampler/segment.png
+++ b/WebContent/VAADIN/themes/sampler/sampler/segment.png
diff --git a/WebContent/VAADIN/themes/sampler/sampler/styles.css b/WebContent/VAADIN/themes/sampler/sampler/styles.css
index e2e0718b96..3b18645d74 100644
--- a/WebContent/VAADIN/themes/sampler/sampler/styles.css
+++ b/WebContent/VAADIN/themes/sampler/sampler/styles.css
@@ -154,7 +154,7 @@
 	display: block;
 	height: 24px;
 	background-repeat: no-repeat;
-	background-position: 50% 30%;
+	background-position: 50% 40%;
 }
 .v-app-SamplerApplication .v-horizontallayout-segment .v-nativebutton-tree-switch span,
 .v-app-SamplerApplication .v-horizontallayout-segment .v-nativebutton-tree-switch.v-pressed span {
@@ -162,7 +162,36 @@
 }
 .v-app-SamplerApplication .v-horizontallayout-segment .v-popupview span {
 	background-image: url(magnifier.png);
-	background-position: 50% 40%;
+}
+.v-app-SamplerApplication .theme-select,
+.v-app-SamplerApplication .theme-select * {
+	background: transparent;
+}
+.v-app-SamplerApplication .theme-select .v-filterselect-input {
+	width: 0;
+	height: 0;
+	padding: 0;
+	overflow: hidden;
+}
+.v-app-SamplerApplication .theme-select {
+	width: 32px;
+	height: 24px;
+	overflow: hidden;
+	padding: 0;
+	border: none;
+	background: transparent url(segment.png) no-repeat;
+}
+.v-app-SamplerApplication .theme-select:active {
+	background-position: 0 bottom;
+}
+.v-app-SamplerApplication .theme-select .v-filterselect-button {
+	width: 32px;
+	height: 24px;
+	cursor: default;
+	background: url(palette.png) no-repeat right 0;
+}
+.v-app-SamplerApplication .theme-select:active .v-filterselect-button {
+	background-position: right bottom;
 }
 .v-app-SamplerApplication .v-horizontallayout-segment .v-nativebutton-previous span,
 .v-app-SamplerApplication .v-horizontallayout-segment .v-nativebutton-previous.v-pressed span,
diff --git a/WebContent/VAADIN/themes/sampler/styles.css b/WebContent/VAADIN/themes/sampler/styles.css
index 00f8978965..6715ad1b9f 100644
--- a/WebContent/VAADIN/themes/sampler/styles.css
+++ b/WebContent/VAADIN/themes/sampler/styles.css
@@ -1,5 +1,3 @@
-@import url(../reindeer/styles.css);
-
 @import url(sampler/styles.css);
 
 @import url(dummy/styles.css);