From 93443ef1a5beada8412db3f08cd755d3848385ac Mon Sep 17 00:00:00 2001 From: bteng22 Date: Thu, 24 Mar 2016 00:08:38 -0700 Subject: [PATCH] Computer Basics (and all Video Challenges) flows out of screen on mobile devices Removing react-bootstrap component Row from Hikes.jsx and Hike.jsx as it adds a row class which tightens the margins. Also removing inline overflow: hidden style that seemed to not affect anything as well as extraneous html elements. Closes #7565 --- common/app/routes/Hikes/components/Hike.jsx | 24 +++++++++----------- common/app/routes/Hikes/components/Hikes.jsx | 16 +++++-------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/common/app/routes/Hikes/components/Hike.jsx b/common/app/routes/Hikes/components/Hike.jsx index 5e147ea6e6..687c1474eb 100644 --- a/common/app/routes/Hikes/components/Hike.jsx +++ b/common/app/routes/Hikes/components/Hike.jsx @@ -1,6 +1,6 @@ import React, { PropTypes } from 'react'; import { connect } from 'react-redux'; -import { Col, Row } from 'react-bootstrap'; +import { Col } from 'react-bootstrap'; import { createSelector } from 'reselect'; import Lecture from './Lecture.jsx'; @@ -55,18 +55,16 @@ export class Hike extends React.Component { return ( - -
-

{ title }

-
-
-
-
- { this.renderBody(shouldShowQuestions) } -
- +
+

{ title }

+
+
+
+
+ { this.renderBody(shouldShowQuestions) } +
); } diff --git a/common/app/routes/Hikes/components/Hikes.jsx b/common/app/routes/Hikes/components/Hikes.jsx index da41f8e4ca..1b34251659 100644 --- a/common/app/routes/Hikes/components/Hikes.jsx +++ b/common/app/routes/Hikes/components/Hikes.jsx @@ -1,7 +1,6 @@ import React, { PropTypes } from 'react'; import { compose } from 'redux'; import { connect } from 'react-redux'; -import { Row } from 'react-bootstrap'; import PureComponent from 'react-pure-render/component'; import { createSelector } from 'reselect'; // import debug from 'debug'; @@ -59,17 +58,14 @@ export class Hikes extends PureComponent { render() { const { hikes } = this.props; - const preventOverflow = { overflow: 'hidden' }; return (
- - { - // render sub-route - this.props.children || - // if no sub-route render hikes map - this.renderMap(hikes) - } - + { + // render sub-route + this.props.children || + // if no sub-route render hikes map + this.renderMap(hikes) + }
); }