Merge branch 'master' into style-polish

Conflicts:
	src/components/ContainerHomeFolders.react.js
	src/components/Containers.react.js
	styles/right-panel.less
	styles/variables.less
This commit is contained in:
Sean Li
2015-06-12 10:48:55 -07:00
9 changed files with 14 additions and 9 deletions

View File

@@ -160,7 +160,7 @@ var Containers = React.createClass({
<section className={sidebarHeaderClass}>
<h4>Containers</h4>
<div className="create">
<Router.Link tabIndex="-1" to="new">
<Router.Link to="new">
<span className="btn btn-new btn-action has-icon btn-hollow"><span className="icon icon-add"></span>New</span>
</Router.Link>
</div>