From d0e86306be2ab952ce8949d17af5dc97193af7c3 Mon Sep 17 00:00:00 2001 From: Tom Robinson <tlrobinson@gmail.com> Date: Wed, 27 Jul 2016 17:40:34 -0700 Subject: [PATCH] Forward style prop to LoadingAndErrorWrapper root element --- frontend/src/metabase/components/LoadingAndErrorWrapper.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/metabase/components/LoadingAndErrorWrapper.jsx b/frontend/src/metabase/components/LoadingAndErrorWrapper.jsx index 22709cd0d2c..fd4c7df8466 100644 --- a/frontend/src/metabase/components/LoadingAndErrorWrapper.jsx +++ b/frontend/src/metabase/components/LoadingAndErrorWrapper.jsx @@ -13,6 +13,7 @@ export default class LoadingAndErrorWrapper extends Component { noBackground: PropTypes.bool, noWrapper: PropTypes.bool, children: PropTypes.any, + style: PropTypes.object }; static defaultProps = { @@ -55,7 +56,7 @@ export default class LoadingAndErrorWrapper extends Component { return React.Children.only(this.getChildren()); } return ( - <div className={this.props.className}> + <div className={this.props.className} style={this.props.style}> { error ? <div className={contentClassName}> <h2 className="text-normal text-grey-2">{this.getErrorMessage()}</h2> -- GitLab