diff options
| author | bobzel <zzzman@gmail.com> | 2020-09-11 18:07:08 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2020-09-11 18:07:08 -0400 |
| commit | 1aacedfa3f558e243f2bca92c62fc0d0cfdce58a (patch) | |
| tree | aafcbac134fdaccd8b26908d0fb40c12052eeff2 /src/client/views/nodes/ColorBox.tsx | |
| parent | 1b8eb5a59edfcef36e8f6450aca82de46d2044eb (diff) | |
| parent | e3c8534e129a3ce70a2673c92cadccec26f6cdc7 (diff) | |
Merge branch 'master' into bug_fixes
Diffstat (limited to 'src/client/views/nodes/ColorBox.tsx')
| -rw-r--r-- | src/client/views/nodes/ColorBox.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/nodes/ColorBox.tsx b/src/client/views/nodes/ColorBox.tsx index 090cf015a..0aa0c33fb 100644 --- a/src/client/views/nodes/ColorBox.tsx +++ b/src/client/views/nodes/ColorBox.tsx @@ -55,7 +55,7 @@ export class ColorBox extends ViewBoxBaseComponent<FieldViewProps, ColorDocument render() { const selDoc = SelectionManager.SelectedDocuments()?.[0]?.rootDoc; return <div className={`colorBox-container${this.active() ? "-interactive" : ""}`} - onPointerDown={e => e.button === 0 && !e.ctrlKey && e.stopPropagation()} + onPointerDown={e => e.button === 0 && !e.ctrlKey && e.stopPropagation()} onClick={e => { (e.nativeEvent as any).stuff = true; e.stopPropagation(); }} style={{ transform: `scale(${this.props.ContentScaling()})`, width: `${100 / this.props.ContentScaling()}%`, height: `${100 / this.props.ContentScaling()}%` }} > <SketchPicker onChange={ColorBox.switchColor} presetColors={['#D0021B', '#F5A623', '#F8E71C', '#8B572A', '#7ED321', '#417505', '#9013FE', '#4A90E2', '#50E3C2', '#B8E986', '#000000', '#4A4A4A', '#9B9B9B', '#FFFFFF', '#f1efeb', 'transparent']} |