diff options
| author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2016-04-06 23:59:01 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2016-04-06 23:59:01 +0200 |
| commit | a0a3bda9340a57203391400a5ac32e87281e8a19 (patch) | |
| tree | 040d69d70cb9e2b649259052ecc1f6984b123db2 /src/web/js/components/RightPanel.react.js | |
| parent | major problems fixed. (diff) | |
| parent | create a new user is now working (diff) | |
| download | newspipe-a0a3bda9340a57203391400a5ac32e87281e8a19.tar.gz newspipe-a0a3bda9340a57203391400a5ac32e87281e8a19.tar.bz2 newspipe-a0a3bda9340a57203391400a5ac32e87281e8a19.zip | |
Fixed merge conflicts.
Diffstat (limited to 'src/web/js/components/RightPanel.react.js')
| -rw-r--r-- | src/web/js/components/RightPanel.react.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/web/js/components/RightPanel.react.js b/src/web/js/components/RightPanel.react.js index 39b06f38..97a7c461 100644 --- a/src/web/js/components/RightPanel.react.js +++ b/src/web/js/components/RightPanel.react.js @@ -172,10 +172,10 @@ var Article = React.createClass({ getBody: function() { return (<div className="panel-body"> {this.getCore()} - <div dangerouslySetInnerHTML={ + <div id="article-content" dangerouslySetInnerHTML={ {__html: this.props.obj.content}} /> </div>); - }, + } }); var Feed = React.createClass({ @@ -317,8 +317,6 @@ var Feed = React.createClass({ <dd><JarrTime stamp={this.props.obj.last_stamp} text={this.props.obj.last_retrieved} /> </dd> - <dt>Number of articles</dt> - <dd>{this.props.obj.nb_articles}</dd> </dl> {this.getErrorFields()} {this.getCategorySelect()} @@ -423,9 +421,9 @@ var RightPanel = React.createClass({ key={this.state.category.id} />); } - return (<Col id="right-panel" xsOffset={4} smOffset={4} - mdOffset={7} lgOffset={6} - xs={8} sm={8} md={5} lg={6}> + return (<Col id="right-panel" xsHidden + smOffset={4} mdOffset={7} lgOffset={6} + sm={8} md={5} lg={6}> {breadcrum} {cntnt} </Col> |