diff options
| author | bobzel <zzzman@gmail.com> | 2020-11-30 10:59:52 -0500 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2020-11-30 10:59:52 -0500 |
| commit | 228ea98b69e848dddf835debb2acf77bbd7ddfbb (patch) | |
| tree | 62e2d3054ab565bc91997db7875d4022e1751564 /src/client/views/collections/collectionMulticolumn | |
| parent | aae3fe10d4f996dfc811977ce457ae33d5fe3bcc (diff) | |
| parent | 5da87a5d161446308031dd4b221f1f7e3a127e72 (diff) | |
Merge branch 'master' into sally-changes
Diffstat (limited to 'src/client/views/collections/collectionMulticolumn')
| -rw-r--r-- | src/client/views/collections/collectionMulticolumn/CollectionMulticolumnView.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/collections/collectionMulticolumn/CollectionMultirowView.tsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/collections/collectionMulticolumn/CollectionMulticolumnView.tsx b/src/client/views/collections/collectionMulticolumn/CollectionMulticolumnView.tsx index 6e16137b5..2e7cdf6d0 100644 --- a/src/client/views/collections/collectionMulticolumn/CollectionMulticolumnView.tsx +++ b/src/client/views/collections/collectionMulticolumn/CollectionMulticolumnView.tsx @@ -216,7 +216,7 @@ export class CollectionMulticolumnView extends CollectionSubView(MulticolumnDocu return <ContentFittingDocumentView Document={layout} DataDoc={layout.resolvedDataDoc as Doc} - backgroundColor={this.props.backgroundColor} + styleProvider={this.props.styleProvider} LayoutTemplate={this.props.ChildLayoutTemplate} LayoutTemplateString={this.props.ChildLayoutString} LibraryPath={this.props.LibraryPath} diff --git a/src/client/views/collections/collectionMulticolumn/CollectionMultirowView.tsx b/src/client/views/collections/collectionMulticolumn/CollectionMultirowView.tsx index c5e1816d9..4206a5171 100644 --- a/src/client/views/collections/collectionMulticolumn/CollectionMultirowView.tsx +++ b/src/client/views/collections/collectionMulticolumn/CollectionMultirowView.tsx @@ -216,7 +216,7 @@ export class CollectionMultirowView extends CollectionSubView(MultirowDocument) return <ContentFittingDocumentView Document={layout} DataDoc={layout.resolvedDataDoc as Doc} - backgroundColor={this.props.backgroundColor} + styleProvider={this.props.styleProvider} LayoutTemplate={this.props.ChildLayoutTemplate} LayoutTemplateString={this.props.ChildLayoutString} LibraryPath={this.props.LibraryPath} |