aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/EditableView.tsx
diff options
context:
space:
mode:
authorandrewdkim <adkim414@gmail.com>2019-07-26 17:37:12 -0400
committerandrewdkim <adkim414@gmail.com>2019-07-26 17:37:12 -0400
commit2dfd6378cf3f472132143bc231090777e49eeec7 (patch)
tree34e631e0551391e5786ae136ba1d596dbc876c76 /src/client/views/EditableView.tsx
parent7cb850105aeefd1234f76aaab5badd45a8660dc4 (diff)
parente189378e5ce01eedd1373172fbd8d8dabf2ad197 (diff)
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into animationtimeline
Diffstat (limited to 'src/client/views/EditableView.tsx')
-rw-r--r--src/client/views/EditableView.tsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/EditableView.tsx b/src/client/views/EditableView.tsx
index f2cdffd38..c66a92f48 100644
--- a/src/client/views/EditableView.tsx
+++ b/src/client/views/EditableView.tsx
@@ -93,7 +93,7 @@ export class EditableView extends React.Component<EditableProps> {
<div className={`editableView-container-editing${this.props.oneLine ? "-oneLine" : ""}`}
style={{ display: this.props.display, height: "auto", maxHeight: `${this.props.height}` }}
onClick={this.onClick} >
- <span style={{ fontStyle: this.props.fontStyle }}>{this.props.contents}</span>
+ <span style={{ fontStyle: this.props.fontStyle, fontSize: this.props.fontSize }}>{this.props.contents}</span>
</div>
);
}