diff --git a/src/mol-plugin/skin/base/components/controls-base.scss b/src/mol-plugin/skin/base/components/controls-base.scss index d2f8f3287374847531442a684fb1cd97f222a94f..4d9573ce7ae95897dde3de9c86cca1126d24b2fd 100644 --- a/src/mol-plugin/skin/base/components/controls-base.scss +++ b/src/mol-plugin/skin/base/components/controls-base.scss @@ -83,14 +83,14 @@ width: 100%; background: $msp-form-control-background; color: $font-color; - border: none !important; + border: none; // !important; padding: 0 $control-spacing; line-height: $row-height - 2px; height: $row-height; -webkit-appearance: none; -moz-appearance: none; appearance: none; - box-shadow: none !important; + box-shadow: none; // !important; &:hover { color: $hover-font-color; diff --git a/src/mol-plugin/ui/controls/parameters.tsx b/src/mol-plugin/ui/controls/parameters.tsx index 47e0abc1ab1274938c33a50680dc84dc78652889..b94b0cf2c781a0ebf836a1ba6d4bd52de507b07c 100644 --- a/src/mol-plugin/ui/controls/parameters.tsx +++ b/src/mol-plugin/ui/controls/parameters.tsx @@ -161,16 +161,25 @@ export class BoundedIntervalControl extends SimpleParam<PD.Interval> { } } +let _colors: React.ReactFragment | undefined = void 0; +function ColorOptions() { + if (_colors) return _colors; + _colors = <>{Object.keys(ColorNames).map(name => + <option key={name} value={(ColorNames as { [k: string]: Color})[name]} style={{ background: `${Color.toStyle((ColorNames as { [k: string]: Color})[name])}` }} > + {name} + </option> + )}</>; + return _colors; +} + export class ColorControl extends SimpleParam<PD.Color> { onChange = (e: React.ChangeEvent<HTMLSelectElement>) => { this.update(Color(parseInt(e.target.value))); } renderControl() { - return <select value={this.props.value} onChange={this.onChange}> - {Object.keys(ColorNames).map(name => { - return <option key={name} value={(ColorNames as { [k: string]: Color})[name]}>{name}</option> - })} + return <select value={this.props.value} onChange={this.onChange} style={{ borderLeft: `16px solid ${Color.toStyle(this.props.value)}` }}> + {ColorOptions()} </select>; } }