Merge commit '98737932a588f1b4a8f8115f2545da63ae7f4e4a'

Conflicts:
	WebContent/VAADIN/themes/base/button/button.css
	WebContent/VAADIN/themes/runo/button/button.css
	tests/integration_tests.xml

1 files changed, 158 insertions, 158 deletions

diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css
index 1bc7d3ac92..2e14d59a90 100644
--- a/WebContent/VAADIN/themes/base/button/button.css
+++ b/WebContent/VAADIN/themes/base/button/button.css
@@ -1,159 +1,159 @@
-/*

- * Default button (more customizable)

- * -------------------------------------- */

-.v-button {

-	display: inline-block;

-	zoom: 1;

-	text-align: center;

-	text-decoration: none;

-	border: 2px outset #ddd;

-	background: #eee;

-	cursor: pointer;

-	white-space: nowrap;

-	margin: 0;

-	padding: .2em 1em;

-	color: inherit;

-	font: inherit;

-	line-height: normal;

-	-khtml-user-select: none;

-	-moz-user-select: none;

-	-ie-user-select: none;

-	user-select: none;

-	-webkit-box-sizing: border-box;

-	-moz-box-sizing: border-box;

-	-ms-box-sizing: border-box;

-	box-sizing: border-box;

-}

-

-.v-button.v-disabled {

-	cursor: default;

-}

-

-.v-button-wrap,

-.v-button-caption {

-	vertical-align: middle;

-	white-space: nowrap;

-	font: inherit;

-	color: inherit;

-	line-height: normal;

-	}

-

-.v-button .v-icon,

-.v-nativebutton .v-icon {

-	vertical-align: middle;

-	margin-right: 3px;

-	border: none;

-	}

-

-.v-button .v-errorindicator,

-.v-nativebutton .v-errorindicator {

-	display: inline-block;

-	zoom: 1;

-	vertical-align: middle;

-	float: none;

-}

-

-/* Link style (we really should deprecate this) */

-.v-button-link,

-.v-nativebutton-link {

-	border: none;

-	text-align: left;

-	background: transparent;

-	padding: 0;

-	color: inherit;

-	-khtml-user-select: text;

-	-moz-user-select: text;

-	-ie-user-select: text;

-	user-select: text;

-}

-

-/* Inset Safari focus outline a bit */

-.v-sa .v-button-link:focus{

-	outline-offset: -3px;

-	}

-

-.v-button-link .v-button-caption,

-.v-nativebutton-link .v-nativebutton-caption {

-	text-decoration: underline;

-	color: inherit;

-	text-align: left;

-	}

-

-

-/*

- * NativeButton styles (html button element)

- * -------------------------------------- */

-.v-nativebutton {

-	text-align: center;

-	cursor: pointer;

-	white-space: nowrap;

-	margin: 0;

-	color: inherit;

-	font: inherit;

-	line-height: normal;

-	}

-.v-nativebutton .v-nativebutton-caption {

-	vertical-align: middle;

-	white-space: nowrap;

-	font: inherit;

-	color: inherit;

-	}

-

-.v-nativebutton .v-icon {

-	vertical-align: middle;

-	margin-right: 3px;

-	}

-

-.v-nativebutton .v-errorindicator {

-	display: inline-block;

-	zoom: 1;

-	float: none;

-}

-/* Fixes stretched buttons in IE7*/

-.v-ie .v-nativebutton {

-	overflow: visible;

-	padding-left: 1em;

-	padding-right: 1em;

-}

-

-.v-ie .v-nativebutton-link {

-	padding: 0;

-}

-

-/*

- * Checkbox styles

- * -------------------------------------- */

- 

- .v-checkbox {

- 	display: block;

- }

-

-.v-checkbox,

-.v-checkbox label,

-.v-checkbox input,

-.v-checkbox .v-icon {

-	vertical-align: middle;

-	white-space: nowrap;

-}

-

-.v-checkbox .v-icon {

-	margin: 0 2px;

-}

-.v-checkbox .v-errorindicator {

-	float: none;

-	display: inline;

-	display: inline-block;

-	zoom: 1;

-}

-

-

-/* Disabled by default

-.v-checkbox-error {

-	background: #ffe0e0;

-}

-*/

-/* Disabled by default

-.v-checkbox-required {

-	background: #ffe0e0;

-}

+/*
+ * Default button (more customizable)
+ * -------------------------------------- */
+.v-button {
+	display: inline-block;
+	zoom: 1;
+	text-align: center;
+	text-decoration: none;
+	border: 2px outset #ddd;
+	background: #eee;
+	cursor: pointer;
+	white-space: nowrap;
+	margin: 0;
+	padding: .2em 1em;
+	color: inherit;
+	font: inherit;
+	line-height: normal;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ie-user-select: none;
+	user-select: none;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	-ms-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.v-button.v-disabled {
+	cursor: default;
+}
+
+.v-button-wrap,
+.v-button-caption {
+	vertical-align: middle;
+	white-space: nowrap;
+	font: inherit;
+	color: inherit;
+	line-height: normal;
+	}
+
+.v-button .v-icon,
+.v-nativebutton .v-icon {
+	vertical-align: middle;
+	margin-right: 3px;
+	border: none;
+	}
+
+.v-button .v-errorindicator,
+.v-nativebutton .v-errorindicator {
+	display: inline-block;
+	zoom: 1;
+	vertical-align: middle;
+	float: none;
+}
+
+/* Link style (we really should deprecate this) */
+.v-button-link,
+.v-nativebutton-link {
+	border: none;
+	text-align: left;
+	background: transparent;
+	padding: 0;
+	color: inherit;
+	-khtml-user-select: text;
+	-moz-user-select: text;
+	-ie-user-select: text;
+	user-select: text;
+}
+
+/* Inset Safari focus outline a bit */
+.v-sa .v-button-link:focus{
+	outline-offset: -3px;
+	}
+
+.v-button-link .v-button-caption,
+.v-nativebutton-link .v-nativebutton-caption {
+	text-decoration: underline;
+	color: inherit;
+	text-align: left;
+	}
+
+
+/*
+ * NativeButton styles (html button element)
+ * -------------------------------------- */
+.v-nativebutton {
+	text-align: center;
+	cursor: pointer;
+	white-space: nowrap;
+	margin: 0;
+	color: inherit;
+	font: inherit;
+	line-height: normal;
+	}
+.v-nativebutton .v-nativebutton-caption {
+	vertical-align: middle;
+	white-space: nowrap;
+	font: inherit;
+	color: inherit;
+	}
+
+.v-nativebutton .v-icon {
+	vertical-align: middle;
+	margin-right: 3px;
+	}
+
+.v-nativebutton .v-errorindicator {
+	display: inline-block;
+	zoom: 1;
+	float: none;
+}
+/* Fixes stretched buttons in IE7*/
+.v-ie .v-nativebutton {
+	overflow: visible;
+	padding-left: 1em;
+	padding-right: 1em;
+}
+
+.v-ie .v-nativebutton-link {
+	padding: 0;
+}
+
+/*
+ * Checkbox styles
+ * -------------------------------------- */
+ 
+ .v-checkbox {
+ 	display: block;
+ }
+
+.v-checkbox,
+.v-checkbox label,
+.v-checkbox input,
+.v-checkbox .v-icon {
+	vertical-align: middle;
+	white-space: nowrap;
+}
+
+.v-checkbox .v-icon {
+	margin: 0 2px;
+}
+.v-checkbox .v-errorindicator {
+	float: none;
+	display: inline;
+	display: inline-block;
+	zoom: 1;
+}
+
+
+/* Disabled by default
+.v-checkbox-error {
+	background: #ffe0e0;
+}
+*/
+/* Disabled by default
+.v-checkbox-required {
+	background: #ffe0e0;
+}
 */
\ No newline at end of file