aboutsummaryrefslogtreecommitdiff
path: root/src/web/js/components/MainApp.react.js
diff options
context:
space:
mode:
authorFrançois Schmidts <francois.schmidts@gmail.com>2016-01-23 12:47:18 +0100
committerFrançois Schmidts <francois.schmidts@gmail.com>2016-01-26 23:47:10 +0100
commit3644d4ef190d2d509c64fdf5c29382cb8a41e235 (patch)
treef95124c888be848294daa4015dda36bf9c73c51d /src/web/js/components/MainApp.react.js
parentmeh, kinda works, sleep now (diff)
downloadnewspipe-3644d4ef190d2d509c64fdf5c29382cb8a41e235.tar.gz
newspipe-3644d4ef190d2d509c64fdf5c29382cb8a41e235.tar.bz2
newspipe-3644d4ef190d2d509c64fdf5c29382cb8a41e235.zip
doing some design
wip toogle read / like
Diffstat (limited to 'src/web/js/components/MainApp.react.js')
-rw-r--r--src/web/js/components/MainApp.react.js21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/web/js/components/MainApp.react.js b/src/web/js/components/MainApp.react.js
index 743c9510..059d2646 100644
--- a/src/web/js/components/MainApp.react.js
+++ b/src/web/js/components/MainApp.react.js
@@ -1,16 +1,23 @@
+var React = require('react');
+var Col = require('react-bootstrap/lib/Col');
+var Grid = require('react-bootstrap/lib/Grid');
+
var Menu = require('./Menu.react');
var MiddlePanel = require('./MiddlePanel.react');
-var React = require('react');
var MainApp = React.createClass({
render: function() {
- return (<div className="container-fluid">
- <div className="row row-offcanvas row-offcanvas-left">
- <Menu />
- <MiddlePanel />
- </div>
- </div>
+ return (<Grid fluid>
+ <Col xsHidden smHidden md={3} lg={2}>
+ <Menu.MenuFilter />
+ <Menu.Menu />
+ </Col>
+ <Col xs={2} sm={2} md={4} lg={4}>
+ <MiddlePanel.MiddlePanelFilter />
+ <MiddlePanel.MiddlePanel />
+ </Col>
+ </Grid>
);
},
});
bgstack15