Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions 2-react-router/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<!-- Custom Fonts -->
<link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
<link href="overrides.css" rel="stylesheet">
</head>

<body>
Expand Down
14 changes: 7 additions & 7 deletions 2-react-router/src/js/components/layout/Nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default class Nav extends React.Component {
}

render() {
const { location } = this.props;
// const { location } = this.props;
const { collapsed } = this.state;
// const featuredClass = location.pathname === "/" ? "active" : "";
// const archivesClass = location.pathname.match(/^\/archives/) ? "active" : "";
Expand All @@ -35,14 +35,14 @@ export default class Nav extends React.Component {
</div>
<div class={"navbar-collapse " + navClass} id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li activeClassName="active" onlyActiveOnIndex={true}>
<IndexLink to="/" onClick={this.toggleCollapse.bind(this)}>Featured</IndexLink>
<li>
<IndexLink to="/" activeClassName="active" onClick={this.toggleCollapse.bind(this)}>Featured</IndexLink>
</li>
<li activeClassName="active">
<Link to="archives" onClick={this.toggleCollapse.bind(this)}>Archives</Link>
<li>
<Link to="archives" activeClassName="active" onClick={this.toggleCollapse.bind(this)}>Archives</Link>
</li>
<li activeClassName="active">
<Link to="settings" onClick={this.toggleCollapse.bind(this)}>Settings</Link>
<li>
<Link to="settings" activeClassName="active" onClick={this.toggleCollapse.bind(this)}>Settings</Link>
</li>
</ul>
</div>
Expand Down
4 changes: 4 additions & 0 deletions 2-react-router/src/overrides.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.navbar-inverse .navbar-nav a.active {
color: #ffffff;
background-color: #022f5a;
}