Merged code changes from 6.2

svn changeset:11069/svn branch:6.3

5 files changed, 32 insertions, 6 deletions

diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css
index aacc05bbb7..9d4bec0fe4 100644
--- a/WebContent/VAADIN/themes/base/button/button.css
+++ b/WebContent/VAADIN/themes/base/button/button.css
@@ -23,7 +23,11 @@
 	-moz-box-sizing: border-box;

 	-ms-box-sizing: border-box;

 	box-sizing: border-box;

-	}

+}

+

+.v-button.v-disabled {

+	cursor: default;

+}

 

 .v-ie6 .v-button {

 	display: inline;

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index f1840c6bf2..28d412536e 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -59,7 +59,11 @@
 	-moz-box-sizing: border-box;
 	-ms-box-sizing: border-box;
 	box-sizing: border-box;
-	}
+}
+
+.v-button.v-disabled {
+	cursor: default;
+}
 
 .v-ie6 .v-button {
 	display: inline;
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-link-style.css b/WebContent/VAADIN/themes/reindeer/button/button-link-style.css
index 14530c8dff..f4ba80b3cd 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-link-style.css
+++ b/WebContent/VAADIN/themes/reindeer/button/button-link-style.css
@@ -14,6 +14,11 @@
 	cursor: pointer;
 	line-height: inherit;
 	}
+
+.v-button.v-button-link.v-disabled,
+.v-button.v-button-link.v-disabled .v-button-wrap {
+	cursor: default;
+	}
 	
 .v-button-link .v-button-caption,
 .v-nativebutton-link .v-nativebutton-caption {
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index afb15e49a8..c4d29c78ce 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_2_0_dev-20091229";}
-.v-theme-version-6_2_0_dev-20091229 {display: none;}
+.v-theme-version:after {content:"9_9_9_INTERNAL-DEBUG-BUILD";}
+.v-theme-version-9_9_9_INTERNAL-DEBUG-BUILD {display: none;}
 /* Automatically compiled css file from subdirectories. */
 
 .v-absolutelayout-wrapper {
@@ -59,7 +59,11 @@
 	-moz-box-sizing: border-box;
 	-ms-box-sizing: border-box;
 	box-sizing: border-box;
-	}
+}
+
+.v-button.v-disabled {
+	cursor: default;
+}
 
 .v-ie6 .v-button {
 	display: inline;
@@ -2177,6 +2181,11 @@ div.v-window-header {
 	cursor: pointer;
 	line-height: inherit;
 	}
+
+.v-button.v-button-link.v-disabled,
+.v-button.v-button-link.v-disabled .v-button-wrap {
+	cursor: default;
+	}
 	
 .v-button-link .v-button-caption,
 .v-nativebutton-link .v-nativebutton-caption {
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 06bce5dfa9..7e14ce6d40 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -59,7 +59,11 @@
 	-moz-box-sizing: border-box;
 	-ms-box-sizing: border-box;
 	box-sizing: border-box;
-	}
+}
+
+.v-button.v-disabled {
+	cursor: default;
+}
 
 .v-ie6 .v-button {
 	display: inline;