diff --git a/client/less/lib/bootstrap/variables.less b/client/less/lib/bootstrap/variables.less
index 4b8959e9a8..86168ec0b3 100755
--- a/client/less/lib/bootstrap/variables.less
+++ b/client/less/lib/bootstrap/variables.less
@@ -144,9 +144,9 @@
@btn-font-weight: normal;
-@btn-default-color: @gray-lighter;
-@btn-default-bg: @gray-lighter;
-@btn-default-border: #ccc;
+@btn-default-color: #000000;
+@btn-default-bg: @body-bg;
+@btn-default-border: #000000;
@btn-primary-color: @brand-primary;
@btn-primary-bg: @brand-primary;
diff --git a/common/app/routes/Hikes/components/Hike.jsx b/common/app/routes/Hikes/components/Hike.jsx
index f9b859db36..85ebdb487f 100644
--- a/common/app/routes/Hikes/components/Hike.jsx
+++ b/common/app/routes/Hikes/components/Hike.jsx
@@ -1,10 +1,6 @@
import React, { PropTypes } from 'react';
import { contain } from 'thundercats-react';
-import {
- Col,
- Panel,
- Row
-} from 'react-bootstrap';
+import { Col, Row } from 'react-bootstrap';
import Lecture from './Lecture.jsx';
import Questions from './Questions.jsx';
@@ -46,17 +42,19 @@ export default contain(
showQuestions
} = this.props;
- const videoTitle =
{ title }
;
-
return (
-
+ { title }
+
+
+
+
{ this.renderBody(showQuestions) }
-
+
);
diff --git a/common/app/routes/Hikes/components/Lecture.jsx b/common/app/routes/Hikes/components/Lecture.jsx
index 77d7fe5c9c..09cea7a998 100644
--- a/common/app/routes/Hikes/components/Lecture.jsx
+++ b/common/app/routes/Hikes/components/Lecture.jsx
@@ -77,10 +77,13 @@ export default contain(
videoId={ id } />
- { this.renderTranscript(description, dashedName) }
+
+ { this.renderTranscript(description, dashedName) }
+
diff --git a/common/app/routes/Hikes/components/Map.jsx b/common/app/routes/Hikes/components/Map.jsx
index 64e837603b..5d4fc98dfe 100644
--- a/common/app/routes/Hikes/components/Map.jsx
+++ b/common/app/routes/Hikes/components/Map.jsx
@@ -1,6 +1,6 @@
import React, { PropTypes } from 'react';
import { Link } from 'react-router';
-import { ListGroup, ListGroupItem, Panel } from 'react-bootstrap';
+import { ListGroup, ListGroupItem } from 'react-bootstrap';
export default React.createClass({
displayName: 'HikesMap',
@@ -26,9 +26,10 @@ export default React.createClass({
return (
-
+
Welcome To Hikes!
-
+
+
{ vidElements }
diff --git a/common/app/routes/Hikes/components/Questions.jsx b/common/app/routes/Hikes/components/Questions.jsx
index 0ac01fb9ee..d41f2ee0d3 100644
--- a/common/app/routes/Hikes/components/Questions.jsx
+++ b/common/app/routes/Hikes/components/Questions.jsx
@@ -1,7 +1,7 @@
import React, { PropTypes } from 'react';
import { spring, Motion } from 'react-motion';
import { contain } from 'thundercats-react';
-import { Button, Col, Panel, Row } from 'react-bootstrap';
+import { Button, Col, Row } from 'react-bootstrap';
const answerThreshold = 100;
@@ -107,11 +107,9 @@ export default contain(
WebkitTransform: `translate3d(${ x }px, 0, 0)`,
transform: `translate3d(${ x }px, 0, 0)`
};
- const title = Question { number }
;
return (
-
+ Question { number }
{ question }
-
+
);
};
},
@@ -152,20 +151,24 @@ export default contain(
{ questionElement }
-
+
+
+
-
+
);