diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-07-15 17:05:03 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-07-15 17:05:03 +0530 |
| commit | 5c6d76f1c7836d8e9f43707384ee2daa74f1565f (patch) | |
| tree | 5f3fdd9a0de0e94eb9797e08b1461804f6a1c9fa /src/client/views/animationtimeline/Timeline.tsx | |
| parent | 9c2410571d08674477eced80419585ebd15faaf0 (diff) | |
| parent | 07d71ea914c5bae3136b6c911c38b3373afcd5a7 (diff) | |
fixed merge conflicts
Diffstat (limited to 'src/client/views/animationtimeline/Timeline.tsx')
| -rw-r--r-- | src/client/views/animationtimeline/Timeline.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/animationtimeline/Timeline.tsx b/src/client/views/animationtimeline/Timeline.tsx index f54bd3aff..eac30ca75 100644 --- a/src/client/views/animationtimeline/Timeline.tsx +++ b/src/client/views/animationtimeline/Timeline.tsx @@ -385,10 +385,10 @@ export class Timeline extends React.Component<FieldViewProps> { const ttime = `Total: ${this.toReadTime(this._time)}`; return ( <div style={{ flexDirection: "column" }}> - <div className="animation-text" style={{ fontSize: "10px", width: "100%", display: !this.props.Document.isATOn ? "block" : "none" }}> + <div className="animation-text" style={{ fontSize: "10pt", width: "100%", display: !this.props.Document.isATOn ? "block" : "none" }}> {ctime} </div> - <div className="animation-text" style={{ fontSize: "10px", width: "100%", display: !this.props.Document.isATOn ? "block" : "none" }}> + <div className="animation-text" style={{ fontSize: "10pt", width: "100%", display: !this.props.Document.isATOn ? "block" : "none" }}> {ttime} </div> </div> |