diff options
| author | Sophie Zhang <sophie_zhang@brown.edu> | 2024-01-30 22:57:53 -0500 |
|---|---|---|
| committer | Sophie Zhang <sophie_zhang@brown.edu> | 2024-01-30 22:57:53 -0500 |
| commit | ab5a45b75d44c4c3277854d0581a200cb1018e73 (patch) | |
| tree | a8f97d0d10dc81e6422120967b4c877d773e0b85 /src | |
| parent | f3dab2a56db5e4a6a3dca58185d94e1ff7d1dc32 (diff) | |
fix merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/PropertiesView.tsx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx index 5cfe0bd5f..05cd18182 100644 --- a/src/client/views/PropertiesView.tsx +++ b/src/client/views/PropertiesView.tsx @@ -2,7 +2,7 @@ import { IconLookup } from '@fortawesome/fontawesome-svg-core'; import { faAnchor, faArrowRight, faWindowMaximize } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Checkbox, Tooltip } from '@mui/material'; -import { Colors, EditableText, IconButton, NumberInput, Size, Slider, Type } from 'browndash-components'; +import { Button, ColorPicker, Colors, EditableText, IconButton, NumberInput, Size, Slider, Type } from 'browndash-components'; import { concat } from 'lodash'; import { IReactionDisposer, action, computed, makeObservable, observable, reaction } from 'mobx'; import { observer } from 'mobx-react'; @@ -41,6 +41,11 @@ import { DocumentView, OpenWhere } from './nodes/DocumentView'; import { StyleProviderFuncType } from './nodes/FieldView'; import { KeyValueBox } from './nodes/KeyValueBox'; import { PresBox, PresEffect, PresEffectDirection } from './nodes/trails'; +import { ExtractColors } from './ExtractColors'; +import TextareaAutosize from 'react-textarea-autosize'; +import { GeneratedResponse, StyleInput, generatePalette } from '../apis/gpt/customization'; +import { FaFillDrip } from 'react-icons/fa'; + const _global = (window /* browser */ || global) /* node */ as any; interface PropertiesViewProps { @@ -1248,7 +1253,7 @@ export class PropertiesView extends ObservableReactComponent<PropertiesViewProps </div> ))} {this.loadingStyles && 'Generating styles...'} - <ReactTextareaAutosize + <TextareaAutosize minRows={3} placeholder="Customize..." className="styling-chatbox" |