Sass restructure: split button into nativebutton and checkbox

1 files changed, 5 insertions, 88 deletions

diff --git a/WebContent/VAADIN/themes/base/button/button.scss b/WebContent/VAADIN/themes/base/button/button.scss
index e6398219ab..37a5973437 100644
--- a/WebContent/VAADIN/themes/base/button/button.scss
+++ b/WebContent/VAADIN/themes/base/button/button.scss
@@ -39,15 +39,13 @@
 	line-height: normal;
 	}
 
-.#{$name} .v-icon,
-.v-nativebutton .v-icon {
+.#{$name} .v-icon {
 	vertical-align: middle;
 	margin-right: 3px;
 	border: none;
 	}
 
-.#{$name} .v-errorindicator,
-.v-nativebutton .v-errorindicator {
+.#{$name} .v-errorindicator {
 	display: inline-block;
 	zoom: 1;
 	vertical-align: middle;
@@ -55,8 +53,7 @@
 }
 
 /* Link style (we really should deprecate this) */
-.#{$name}-link,
-.v-nativebutton-link {
+.#{$name}-link {
 	border: none;
 	text-align: left !important;
 	background: transparent;
@@ -73,90 +70,10 @@
 	outline-offset: -3px;
 	}
 
-.#{$name}-link .#{$name}-caption,
-.v-nativebutton-link .v-nativebutton-caption {
+.#{$name}-link .#{$name}-caption {
 	text-decoration: underline;
 	color: inherit;
 	text-align: left;
 	}
 
-
-/*
- * NativeButton styles (html button element)
- * -------------------------------------- */
-.v-nativebutton {
-	text-align: center !important;
-	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