Skip to content

Commit 8087a3f

Browse files
committed
Revert "Make navigation back to Collection List more obvious"
This reverts commit 740401d.
1 parent 442360c commit 8087a3f

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

client/components/Nav.jsx

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -230,22 +230,16 @@ class Nav extends React.PureComponent {
230230
return (
231231
<ul className="nav__items-left" title="project-menu">
232232
<li className="nav__item-logo">
233+
<InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
234+
</li>
235+
<li className="nav__item nav__item--no-icon">
233236
<Link to="/" className="nav__back-link">
234-
<InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
237+
<InlineSVG src={caretLeft} className="nav__back-icon" />
238+
<span className="nav__item-header">
239+
Back to Editor
240+
</span>
235241
</Link>
236242
</li>
237-
{
238-
this.props.ownerName && (
239-
<li className="nav__item nav__item--no-icon">
240-
<Link to={`/${this.props.ownerName}/collections`} className="nav__back-link">
241-
<InlineSVG src={caretLeft} className="nav__back-icon" />
242-
<span className="nav__item-header">
243-
Collections
244-
</span>
245-
</Link>
246-
</li>
247-
)
248-
}
249243
</ul>
250244
);
251245
}
@@ -721,7 +715,6 @@ Nav.propTypes = {
721715
username: PropTypes.string,
722716
id: PropTypes.string
723717
}).isRequired,
724-
ownerName: PropTypes.string,
725718
project: PropTypes.shape({
726719
id: PropTypes.string,
727720
owner: PropTypes.shape({
@@ -759,8 +752,7 @@ Nav.defaultProps = {
759752
},
760753
cmController: {},
761754
layout: 'project',
762-
warnIfUnsavedChanges: undefined,
763-
ownerName: null,
755+
warnIfUnsavedChanges: undefined
764756
};
765757

766758
function mapStateToProps(state) {

client/modules/User/pages/CollectionView.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class CollectionView extends React.Component {
5656
render() {
5757
return (
5858
<div className="dashboard">
59-
<Nav layout="dashboard" ownerName={this.ownerName()} />
59+
<Nav layout="dashboard" />
6060

6161
{this.renderContent()}
6262
</div>

0 commit comments

Comments
 (0)