Revert "Make navigation back to Collection List more obvious"
This reverts commit 740401d18b
.
This commit is contained in:
parent
442360cab5
commit
8087a3fcb3
2 changed files with 9 additions and 17 deletions
|
@ -230,22 +230,16 @@ class Nav extends React.PureComponent {
|
||||||
return (
|
return (
|
||||||
<ul className="nav__items-left" title="project-menu">
|
<ul className="nav__items-left" title="project-menu">
|
||||||
<li className="nav__item-logo">
|
<li className="nav__item-logo">
|
||||||
<Link to="/" className="nav__back-link">
|
|
||||||
<InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
|
<InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
|
||||||
</Link>
|
|
||||||
</li>
|
</li>
|
||||||
{
|
|
||||||
this.props.ownerName && (
|
|
||||||
<li className="nav__item nav__item--no-icon">
|
<li className="nav__item nav__item--no-icon">
|
||||||
<Link to={`/${this.props.ownerName}/collections`} className="nav__back-link">
|
<Link to="/" className="nav__back-link">
|
||||||
<InlineSVG src={caretLeft} className="nav__back-icon" />
|
<InlineSVG src={caretLeft} className="nav__back-icon" />
|
||||||
<span className="nav__item-header">
|
<span className="nav__item-header">
|
||||||
Collections
|
Back to Editor
|
||||||
</span>
|
</span>
|
||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
)
|
|
||||||
}
|
|
||||||
</ul>
|
</ul>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -721,7 +715,6 @@ Nav.propTypes = {
|
||||||
username: PropTypes.string,
|
username: PropTypes.string,
|
||||||
id: PropTypes.string
|
id: PropTypes.string
|
||||||
}).isRequired,
|
}).isRequired,
|
||||||
ownerName: PropTypes.string,
|
|
||||||
project: PropTypes.shape({
|
project: PropTypes.shape({
|
||||||
id: PropTypes.string,
|
id: PropTypes.string,
|
||||||
owner: PropTypes.shape({
|
owner: PropTypes.shape({
|
||||||
|
@ -759,8 +752,7 @@ Nav.defaultProps = {
|
||||||
},
|
},
|
||||||
cmController: {},
|
cmController: {},
|
||||||
layout: 'project',
|
layout: 'project',
|
||||||
warnIfUnsavedChanges: undefined,
|
warnIfUnsavedChanges: undefined
|
||||||
ownerName: null,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
function mapStateToProps(state) {
|
function mapStateToProps(state) {
|
||||||
|
|
|
@ -56,7 +56,7 @@ class CollectionView extends React.Component {
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div className="dashboard">
|
<div className="dashboard">
|
||||||
<Nav layout="dashboard" ownerName={this.ownerName()} />
|
<Nav layout="dashboard" />
|
||||||
|
|
||||||
{this.renderContent()}
|
{this.renderContent()}
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue