fix(treeview): do not base treeview variables on button variables

telerik · Nov 5, 2020 · 3005f6d · 3005f6d
1 parent 6522a00
commit 3005f6d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/packages/bootstrap/scss/treeview/_variables.scss b/packages/bootstrap/scss/treeview/_variables.scss
@@ -3,14 +3,14 @@ $treeview-padding-x: 2px !default;
 $treeview-padding-y: $treeview-padding-x !default;
 $treeview-font-family: $font-family !default;
 $treeview-font-size: $font-size !default;
-$treeview-line-height: $form-line-height !default;
+$treeview-line-height: $line-height !default;
 
 $treeview-indent: 16px !default;
 
-$treeview-item-padding-x: $button-padding-y !default;
+$treeview-item-padding-x: ( map-get( $spacing, 1 ) * 1.5 ) !default;
 $treeview-item-padding-y: $treeview-item-padding-x !default;
 $treeview-item-border-width: 1px !default;
-$treeview-item-border-radius: $border-radius !default;
+$treeview-item-border-radius: map-get( $spacing, 1 ) !default;
 
 $treeview-bg: null !default;
 $treeview-text: $component-text !default;

diff --git a/packages/classic/scss/treeview/_variables.scss b/packages/classic/scss/treeview/_variables.scss
@@ -3,14 +3,14 @@ $treeview-padding-x: 0px !default;
 $treeview-padding-y: 0px !default;
 $treeview-font-family: $font-family !default;
 $treeview-font-size: $font-size !default;
-$treeview-line-height: $form-line-height !default;
+$treeview-line-height: $line-height !default;
 
 $treeview-indent: 16px !default;
 
-$treeview-item-padding-x: $button-padding-x !default;
-$treeview-item-padding-y: $button-padding-y !default;
+$treeview-item-padding-x: map-get( $spacing, 1 ) !default;
+$treeview-item-padding-y: $treeview-item-padding-x !default;
 $treeview-item-border-width: 0px !default;
-$treeview-item-border-radius: 0px !default;
+$treeview-item-border-radius: map-get( $spacing, 1 ) !default;
 
 $treeview-bg: null !default;
 $treeview-text: $component-text !default;

diff --git a/packages/default/scss/treeview/_variables.scss b/packages/default/scss/treeview/_variables.scss
@@ -3,14 +3,14 @@ $treeview-padding-x: 0px !default;
 $treeview-padding-y: 0px !default;
 $treeview-font-family: $font-family !default;
 $treeview-font-size: $font-size !default;
-$treeview-line-height: $form-line-height !default;
+$treeview-line-height: $line-height !default;
 
 $treeview-indent: 16px !default;
 
-$treeview-item-padding-x: $button-padding-x !default;
-$treeview-item-padding-y: $button-padding-y !default;
+$treeview-item-padding-x: map-get( $spacing, 2 ) !default;
+$treeview-item-padding-y: map-get( $spacing, 1 ) !default;
 $treeview-item-border-width: 0px !default;
-$treeview-item-border-radius: 0px !default;
+$treeview-item-border-radius: null !default;
 
 $treeview-bg: null !default;
 $treeview-text: $component-text !default;

diff --git a/packages/material/scss/treeview/_variables.scss b/packages/material/scss/treeview/_variables.scss
@@ -10,7 +10,7 @@ $treeview-indent: 16px !default;
 $treeview-item-padding-x: 8px !default;
 $treeview-item-padding-y: 6px !default;
 $treeview-item-border-width: 0px !default;
-$treeview-item-border-radius: 0px !default;
+$treeview-item-border-radius: null !default;
 
 $treeview-bg: null !default;
 $treeview-text: $component-text !default;