gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7719 from bteng22/fix/mobile-text-overflow

Browse Source 
Video challenges content appears out of mobile screens
This commit is contained in:
Berkeley Martinez
2016-04-02 07:47:21 -07:00
parent f32f3d1787 93443ef1a5
commit 1f8e1d2c2e
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/app/routes/Hikes/components/Hike.jsx
View File

@ -1,6 +1,6 @@
import React, { PropTypes } from 'react'; import React, { PropTypes } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { Col, Row } from 'react-bootstrap'; import { Col } from 'react-bootstrap';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import Lecture from './Lecture.jsx'; import Lecture from './Lecture.jsx';
@ -55,18 +55,16 @@ export class Hike extends React.Component {
return ( return (
<Col xs={ 12 }> <Col xs={ 12 }>
<Row> <header className='text-center'>
<header className='text-center'> <h4>{ title }</h4>
<h4>{ title }</h4> </header>
</header> <hr />
<hr /> <div className='spacer' />
<div className='spacer' /> <section
<section className={ 'text-center' }
className={ 'text-center' } title={ title }>
title={ title }> { this.renderBody(shouldShowQuestions) }
{ this.renderBody(shouldShowQuestions) } </section>
</section>
</Row>
</Col> </Col>
); );
} }

16
common/app/routes/Hikes/components/Hikes.jsx
View File

@ -1,7 +1,6 @@
import React, { PropTypes } from 'react'; import React, { PropTypes } from 'react';
import { compose } from 'redux'; import { compose } from 'redux';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { Row } from 'react-bootstrap';
import PureComponent from 'react-pure-render/component'; import PureComponent from 'react-pure-render/component';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
// import debug from 'debug'; // import debug from 'debug';
@ -59,17 +58,14 @@ export class Hikes extends PureComponent {
render() { render() {
const { hikes } = this.props; const { hikes } = this.props;
const preventOverflow = { overflow: 'hidden' };
return ( return (
<div> <div>
<Row style={ preventOverflow }> {
{ // render sub-route
// render sub-route this.props.children ||
this.props.children || // if no sub-route render hikes map
// if no sub-route render hikes map this.renderMap(hikes)
this.renderMap(hikes) }
}
</Row>
</div> </div>
); );
} }