summaryrefslogtreecommitdiffhomepage
path: root/app/components/Layout.js
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@codeispoetry.ru>2017-02-16 17:30:09 +0000
committerAndrej Mihajlov <and@codeispoetry.ru>2017-02-16 17:30:09 +0000
commitca574470c6ce9449a43eaeb81fcb8a35a7656923 (patch)
treee32fd43d0e0c4205c1e28e72c7a5c4b5683cf920 /app/components/Layout.js
parent4aaf7e0ddbbdf9a5e03fdbb20ecabe4866de96c3 (diff)
downloadmullvadvpn-ca574470c6ce9449a43eaeb81fcb8a35a7656923.tar.xz
mullvadvpn-ca574470c6ce9449a43eaeb81fcb8a35a7656923.zip
Add settings pane
Diffstat (limited to 'app/components/Layout.js')
-rw-r--r--app/components/Layout.js12
1 files changed, 8 insertions, 4 deletions
diff --git a/app/components/Layout.js b/app/components/Layout.js
index 50f52e7dca..c4e66aed85 100644
--- a/app/components/Layout.js
+++ b/app/components/Layout.js
@@ -8,7 +8,7 @@ export class Header extends Component {
render() {
return (
<div className="layout__header">
- <HeaderBar {...this.props} />
+ <HeaderBar { ...this.props } />
</div>
);
}
@@ -22,7 +22,7 @@ export class Container extends Component {
render() {
return (
<div className="layout__container">
- {this.props.children}
+ { this.props.children }
</div>
);
}
@@ -30,12 +30,16 @@ export class Container extends Component {
export class Layout extends Component {
static propTypes = {
- children: PropTypes.arrayOf(PropTypes.node).isRequired
+ children: PropTypes.oneOfType([
+ PropTypes.arrayOf(PropTypes.element),
+ PropTypes.element,
+ ])
};
+
render() {
return (
<div className="layout">
- {this.props.children}
+ { this.props.children }
</div>
);
}