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

Fix nav brand issue

Browse Source 
bump react router
This commit is contained in:
Berkeley Martinez
2015-11-08 22:28:05 -08:00
parent 9ca11ebed2
commit 108f54d019
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/app/components/Nav/Nav.jsx
View File

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

2
package.json
View File

@ -101,7 +101,7 @@
"react": "^0.14.2", "react": "^0.14.2",
"react-bootstrap": "~0.27.3", "react-bootstrap": "~0.27.3",
"react-motion": "~0.3.1", "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-router-bootstrap": "^0.19.2",
"react-vimeo": "^0.0.3", "react-vimeo": "^0.0.3",
"request": "~2.65.0", "request": "~2.65.0",