Skip to content

Commit 3723eda

Browse files
committed
fix(Tree): add calc to tree variable
1 parent 514b18e commit 3723eda

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

src/tree/main.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
border-bottom: $tree-line;
161161

162162
#{$tree-prefix}-right-angle {
163-
bottom: -$tree-line-width;
163+
bottom: calc(0px - #{$tree-line-width});
164164
}
165165
}
166166

@@ -187,9 +187,9 @@
187187
&-right-angle {
188188
position: absolute;
189189
bottom: calc((#{$tree-switch-size} - #{$tree-switch-border-width} * 2 - #{$tree-line-width}) / 2);
190-
left: calc(0px - (#{$tree-child-indent-right} + #{$tree-line-width} + #{$tree-switch-border-width}));
190+
left: $tree-child-right-angle-left;
191191
display: block;
192-
width: calc(#{$tree-child-indent-right} + #{$tree-line-width});
192+
width: $tree-child-right-angle-width;
193193
height: calc(#{$tree-node-title-height} + #{$tree-node-padding} - #{$tree-line-width} * 2);
194194
border-left: $tree-line;
195195
border-bottom: $tree-line;

src/tree/rtl.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
&-right-angle {
1212
left: auto;
13-
right: calc(0px - (#{$tree-child-indent-right} + #{$tree-line-width} + #{$tree-switch-border-width}));
13+
right: $tree-child-right-angle-left;
1414
border-left: none;
1515
border-right: $tree-line;
1616
}

src/tree/scss/variable.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,12 @@ $tree-node-disabled-background: $color-white !default;
147147

148148
$tree-child-indent: $s-6 !default;
149149
$tree-node-title-height: $s-5 !default;
150-
$tree-child-indent-left: (#{$tree-switch-size} - #{$tree-line-width}) / 2;
151-
$tree-child-indent-right: #{$tree-child-indent} - #{$tree-line-width} - #{$tree-child-indent-left};
150+
$tree-child-indent-left: calc((#{$tree-switch-size} - #{$tree-line-width}) / 2);
151+
$tree-child-indent-right: calc(#{$tree-child-indent} - #{$tree-line-width} - (#{$tree-switch-size} - #{$tree-line-width}) / 2);
152+
$tree-child-right-angle-left: calc(0px - (#{$tree-child-indent} - (#{$tree-switch-size} - #{$tree-line-width}) / 2 + #{$tree-switch-border-width}));
153+
$tree-child-right-angle-width: calc(#{$tree-child-indent} - (#{$tree-switch-size} - #{$tree-line-width}) / 2);
154+
155+
152156
$tree-line: $tree-line-width $tree-line-style $tree-line-color;
153157

154158

0 commit comments

Comments
 (0)