Merge pull request #4259 from FreeCodeCamp/fix/react-branch-router

Fix nav brand issue

common/app/components/Nav/Nav.jsx

@@ -4,6 +4,7 @@ import {
   Col,
   CollapsibleNav,
   Nav,
+  NavBrand,
   Navbar,
   NavItem
 } from 'react-bootstrap';
@@ -106,11 +107,11 @@ export default React.createClass({
     const { username, points, picture } = this.props;
     return (
       <Navbar
-        brand={ logoElement }
         className='nav-height'
         fixedTop={ true }
         toggleButton={ toggleButton }
         toggleNavKey={ 0 }>
+        <NavBrand>{ logoElement }</NavBrand>
         <CollapsibleNav eventKey={ 0 }>
           <Nav
             className='hamburger-dropdown'

common/app/routes/Jobs/components/List.jsx

@@ -38,6 +38,7 @@ export default React.createClass({
 
         const className = classnames({
           'jobs-list': true,
+          'col-xs-12': true,
           'jobs-list-highlight': isHighlighted
         });
 
@@ -47,7 +48,7 @@ export default React.createClass({
             key={ id }
             onClick={ () => handleClick(id) }>
             <div>
-              <h4 style={{ display: 'inline-block' }}>
+              <h4 className='pull-left' style={{ display: 'inline-block' }}>
                 <bold>{ company }</bold>
                 {' '}
                 <span className='hidden-xs hidden-sm'>

package.json

@@ -101,7 +101,7 @@
     "react": "^0.14.2",
     "react-bootstrap": "~0.27.3",
     "react-motion": "~0.3.1",
-    "react-router": "https://github.com/BerkeleyTrue/react-router.git#freecodecamp",
+    "react-router": "^1.0.0-rc4",
     "react-router-bootstrap": "^0.19.2",
     "react-vimeo": "^0.0.3",
     "request": "~2.65.0",