aboutsummaryrefslogtreecommitdiff
path: root/src/web/js/components/MainApp.react.js
diff options
context:
space:
mode:
authorFrançois Schmidts <francois.schmidts@gmail.com>2016-01-25 12:40:23 +0100
committerFrançois Schmidts <francois.schmidts@gmail.com>2016-01-26 23:47:57 +0100
commitf0dd6d526160fdb98a5f55b4e45b84652590df58 (patch)
treef2a4e82f7618f9d22052f954b22ce8a03ef80ee1 /src/web/js/components/MainApp.react.js
parentdoing some design (diff)
downloadnewspipe-f0dd6d526160fdb98a5f55b4e45b84652590df58.tar.gz
newspipe-f0dd6d526160fdb98a5f55b4e45b84652590df58.tar.bz2
newspipe-f0dd6d526160fdb98a5f55b4e45b84652590df58.zip
bootstraping right panel
Diffstat (limited to 'src/web/js/components/MainApp.react.js')
-rw-r--r--src/web/js/components/MainApp.react.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/web/js/components/MainApp.react.js b/src/web/js/components/MainApp.react.js
index 059d2646..bd643be1 100644
--- a/src/web/js/components/MainApp.react.js
+++ b/src/web/js/components/MainApp.react.js
@@ -4,6 +4,7 @@ var Grid = require('react-bootstrap/lib/Grid');
var Menu = require('./Menu.react');
var MiddlePanel = require('./MiddlePanel.react');
+var RightPanel = require('./RightPanel.react');
var MainApp = React.createClass({
@@ -17,6 +18,10 @@ var MainApp = React.createClass({
<MiddlePanel.MiddlePanelFilter />
<MiddlePanel.MiddlePanel />
</Col>
+ <Col xs={10} sm={10} md={8} lg={8}>
+ <RightPanel.RightPanelMenu />
+ <RightPanel.RightPanel />
+ </Col>
</Grid>
);
},
bgstack15