diff options
| author | Sam Wilkins <35748010+samwilkins333@users.noreply.github.com> | 2020-02-12 14:45:49 -0500 |
|---|---|---|
| committer | Sam Wilkins <35748010+samwilkins333@users.noreply.github.com> | 2020-02-12 14:45:49 -0500 |
| commit | 2d76d891cb6a656f3c404d17ffa1cac05e08d115 (patch) | |
| tree | 2043abb369fd3cc10212ed24d470eebfa2bbe8b2 /src/client/views/nodes/CollectionFreeFormDocumentView.tsx | |
| parent | f94747ea7ee6e51ad2c1efc780e531313ea1a3b9 (diff) | |
| parent | 1ae7bb0792c233d8379e1949f965c864667cf3ae (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
Diffstat (limited to 'src/client/views/nodes/CollectionFreeFormDocumentView.tsx')
| -rw-r--r-- | src/client/views/nodes/CollectionFreeFormDocumentView.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx index 3bceec45f..3c27ac9a1 100644 --- a/src/client/views/nodes/CollectionFreeFormDocumentView.tsx +++ b/src/client/views/nodes/CollectionFreeFormDocumentView.tsx @@ -84,7 +84,7 @@ export class CollectionFreeFormDocumentView extends DocComponent<CollectionFreeF borderRadius: StrCast(Doc.Layout(this.layoutDoc).borderRounding), outline: this.Highlight ? "orange solid 2px" : "", transform: this.transform, - transition: this.Document.isAnimating ? ".5s ease-in" : this.props.transition ? this.props.transition : this.dataProvider ? this.dataProvider.transition : StrCast(this.layoutDoc.transition), + transition: this.props.transition ? this.props.transition : this.dataProvider ? this.dataProvider.transition : StrCast(this.layoutDoc.transition), width: this.width, height: this.height, zIndex: this.ZInd, |