diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-07-15 17:05:03 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-07-15 17:05:03 +0530 |
| commit | 5c6d76f1c7836d8e9f43707384ee2daa74f1565f (patch) | |
| tree | 5f3fdd9a0de0e94eb9797e08b1461804f6a1c9fa /src/client/views/nodes/SliderBox.tsx | |
| parent | 9c2410571d08674477eced80419585ebd15faaf0 (diff) | |
| parent | 07d71ea914c5bae3136b6c911c38b3373afcd5a7 (diff) | |
fixed merge conflicts
Diffstat (limited to 'src/client/views/nodes/SliderBox.tsx')
| -rw-r--r-- | src/client/views/nodes/SliderBox.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/nodes/SliderBox.tsx b/src/client/views/nodes/SliderBox.tsx index 9a1aefba9..45cdfc5ad 100644 --- a/src/client/views/nodes/SliderBox.tsx +++ b/src/client/views/nodes/SliderBox.tsx @@ -56,7 +56,7 @@ export class SliderBox extends ViewBoxBaseComponent<FieldViewProps, SliderDocume style={{ boxShadow: this.layoutDoc.opacity === 0 ? undefined : StrCast(this.layoutDoc.boxShadow, "") }}> <div className="sliderBox-mainButton" onContextMenu={this.specificContextMenu} style={{ background: StrCast(this.layoutDoc.backgroundColor), color: StrCast(this.layoutDoc.color, "black"), - fontSize: NumCast(this.layoutDoc._fontSize), letterSpacing: StrCast(this.layoutDoc.letterSpacing) + fontSize: StrCast(this.layoutDoc._fontSize), letterSpacing: StrCast(this.layoutDoc.letterSpacing) }} > <Slider mode={2} |