From f1178d376cc7bdeceda59ffc5d16c4827578648c Mon Sep 17 00:00:00 2001 From: Sonja Happ Date: Tue, 16 Mar 2021 16:16:40 +0100 Subject: [PATCH] set default size of edit widget dialogs to sm, fix appearance of color control, fix missing import in plot color control --- .../edit-widget/edit-widget-color-control.js | 34 +++++++++++-------- .../edit-widget-plot-colors-control.js | 2 +- src/widget/edit-widget/edit-widget.js | 1 + 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/widget/edit-widget/edit-widget-color-control.js b/src/widget/edit-widget/edit-widget-color-control.js index ada958f..6fd82f7 100644 --- a/src/widget/edit-widget/edit-widget-color-control.js +++ b/src/widget/edit-widget/edit-widget-color-control.js @@ -16,7 +16,7 @@ ******************************************************************************/ import React, { Component } from 'react'; -import { Form, OverlayTrigger, Tooltip, Button } from 'react-bootstrap'; +import { Form, OverlayTrigger, Tooltip, Button, Col } from 'react-bootstrap'; import ColorPicker from './color-picker' import Icon from "../../common/icon"; @@ -77,8 +77,8 @@ class EditWidgetColorControl extends Component { let style = { backgroundColor: color, opacity: opacity, - width: '260px', - height: '40px' + width: '80px', + height: '40px', } let tooltipText = "Change color and opacity"; @@ -87,19 +87,23 @@ class EditWidgetColorControl extends Component { } - return - {this.props.label} + return ( + + {this.props.label} + -
- {tooltipText} } > - - -
- - this.closeEditModal(data)} widget={this.state.widget} controlId={this.props.controlId} disableOpacity={this.props.disableOpacity}/> -
; + +
+ {tooltipText} } > + + +
+ this.closeEditModal(data)} widget={this.state.widget} controlId={this.props.controlId} disableOpacity={this.props.disableOpacity}/> +
+ + ); } } diff --git a/src/widget/edit-widget/edit-widget-plot-colors-control.js b/src/widget/edit-widget/edit-widget-plot-colors-control.js index 271cec2..fbef75c 100644 --- a/src/widget/edit-widget/edit-widget-plot-colors-control.js +++ b/src/widget/edit-widget/edit-widget-plot-colors-control.js @@ -16,7 +16,7 @@ ******************************************************************************/ import React, { Component } from 'react'; -import { OverlayTrigger, Tooltip , Button } from 'react-bootstrap'; +import { OverlayTrigger, Tooltip , Button, Form } from 'react-bootstrap'; import ColorPicker from './color-picker' import Icon from "../../common/icon"; import { scaleOrdinal } from "d3-scale"; diff --git a/src/widget/edit-widget/edit-widget.js b/src/widget/edit-widget/edit-widget.js index e7792a8..6ceef7b 100644 --- a/src/widget/edit-widget/edit-widget.js +++ b/src/widget/edit-widget/edit-widget.js @@ -174,6 +174,7 @@ class EditWidgetDialog extends React.Component { onClose={(c) => this.onClose(c)} onReset={() => this.resetState()} valid={this.valid} + size={'sm'} >
{ controls || '' }