fix(switch): align classic theme colors with less themes

telerik · Jan 17, 2022 · b647dcf · b647dcf
1 parent f5f9bf0
commit b647dcf
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 33 deletions.
diff --git a/packages/classic/scss/switch/_variables.scss b/packages/classic/scss/switch/_variables.scss
@@ -3,15 +3,15 @@ $switch-size: 60px !default;
 $switch-border-radius: 9999px !default;
 
 $switch-font-family: $font-family !default;
-$switch-font-size: $font-size-xs !default;
+$switch-font-size: $font-size-sm !default;
 $switch-line-height: $line-height !default;
 
 $switch-track-size: null !default;
-$switch-container-border-width: 0px !default;
-$switch-container-padding-x: 0px !default;
+$switch-container-border-width: 1px !default;
+$switch-container-padding-x: 2px !default;
 $switch-container-padding-y: $switch-container-padding-x !default;
 
-$switch-handle-size: 30px !default;
+$switch-handle-size: 24px !default;
 $switch-handle-border-radius: 9999px !default;
 $switch-handle-border-width: 1px !default;
 $switch-thumb-start-x: 0px !default;
@@ -20,21 +20,21 @@ $switch-thumb-end-x: calc( 100% - #{$switch-handle-size}) !default;
 
 $switch-label-offset: 8px !default;
 $switch-label-width: calc( 100% - (#{$switch-handle-size} + #{$switch-label-offset} + #{$switch-container-padding-x} ) ) !default;
-$switch-label-text-transform: uppercase !default;
+$switch-label-text-transform: null !default;
 $switch-label-display: inline !default;
 
-$switch-container-shadow: inset 0 0 0 1px $base-border !default;
-$switch-container-hovered-shadow: inset 0 0 0 1px $hovered-border !default;
-$switch-container-focused-shadow: inset 0 0 0 3px rgba( black, .06) !default;
+$switch-container-shadow: null !default;
+$switch-container-hovered-shadow: null !default;
+$switch-container-focused-shadow: 0 0 3px 1px rgba( if($dark-theme, $white, $black), .25 ) !default;
 
-$switch-on-bg: $primary !default;
-$switch-on-text: contrast-wcag( $switch-on-bg ) !default;
-$switch-on-border: null !default;
+$switch-on-bg: $component-bg !default;
+$switch-on-text: $primary !default;
+$switch-on-border: $component-border !default;
 $switch-on-gradient: null !default;
 $switch-on-shadow: null !default;
 
-$switch-on-hovered-bg: shade( $switch-on-bg ) !default;
-$switch-on-hovered-text: $switch-on-text !default;
+$switch-on-hovered-bg: null !default;
+$switch-on-hovered-text: null !default;
 $switch-on-hovered-border: null !default;
 $switch-on-hovered-gradient: null !default;
 
@@ -44,25 +44,25 @@ $switch-on-focused-border: null !default;
 $switch-on-focused-gradient: null !default;
 $switch-on-focused-shadow: null !default;
 
-$switch-on-handle-bg: darken( white, 5 ) !default;
-$switch-on-handle-text: $switch-on-text !default;
-$switch-on-handle-border: $base-border !default;
-$switch-on-handle-gradient: null !default;
+$switch-on-handle-bg: $primary !default;
+$switch-on-handle-text: null !default;
+$switch-on-handle-border: try-shade( $switch-on-handle-bg ) !default;
+$switch-on-handle-gradient: $base-gradient !default;
 $switch-on-handle-shadow: null !default;
 
-$switch-on-handle-hovered-bg: darken( white, 7 ) !default;
-$switch-on-handle-hovered-text: $switch-on-text !default;
-$switch-on-handle-hovered-border: $hovered-border !default;
+$switch-on-handle-hovered-bg: try-shade( $switch-on-handle-bg ) !default;
+$switch-on-handle-hovered-text: null !default;
+$switch-on-handle-hovered-border: try-shade( $switch-on-handle-hovered-bg ) !default;
 $switch-on-handle-hovered-gradient: null !default;
 
 $switch-off-bg: $component-bg !default;
 $switch-off-text: $component-text !default;
-$switch-off-border: null !default;
+$switch-off-border: $component-border !default;
 $switch-off-gradient: null !default;
 $switch-off-shadow: null !default;
 
-$switch-off-hovered-bg: $switch-off-bg !default;
-$switch-off-hovered-text: $switch-off-text !default;
+$switch-off-hovered-bg: null !default;
+$switch-off-hovered-text: null !default;
 $switch-off-hovered-border: null !default;
 $switch-off-hovered-gradient: null !default;
 
@@ -72,13 +72,13 @@ $switch-off-focused-border: null !default;
 $switch-off-focused-gradient: null !default;
 $switch-off-focused-shadow: null !default;
 
-$switch-off-handle-bg: $switch-on-handle-bg !default;
-$switch-off-handle-text: $switch-off-text !default;
-$switch-off-handle-border: $switch-on-handle-border !default;
-$switch-off-handle-gradient: null !default;
+$switch-off-handle-bg: try-shade( $switch-off-bg ) !default;
+$switch-off-handle-text: null !default;
+$switch-off-handle-border: $switch-off-border !default;
+$switch-off-handle-gradient: $base-gradient !default;
 $switch-off-handle-shadow: null !default;
 
-$switch-off-handle-hovered-bg: $switch-on-handle-hovered-bg !default;
-$switch-off-handle-hovered-text: $switch-off-text !default;
-$switch-off-handle-hovered-border: $switch-on-handle-hovered-border !default;
+$switch-off-handle-hovered-bg: try-shade( $switch-off-handle-bg ) !default;
+$switch-off-handle-hovered-text: null !default;
+$switch-off-handle-hovered-border: $switch-off-border !default;
 $switch-off-handle-hovered-gradient: null !default;
diff --git a/packages/default/scss/switch/_layout.scss b/packages/default/scss/switch/_layout.scss
@@ -9,9 +9,9 @@
         display: inline-flex;
         align-items: center;
         vertical-align: middle;
-        font-family: $font-family;
-        font-size: $font-size-xs;
-        line-height: $line-height;
+        font-family: $switch-font-family;
+        font-size: $switch-font-size;
+        line-height: $switch-line-height;
         user-select: none;
         text-align: left;
         -webkit-touch-callout: none;