Merge branch 'master' into feature/storybook-components

Author: andrewn

Diff for: client/components/Nav.jsx

@@ -281,7 +281,7 @@ class Nav extends React.PureComponent {
                 onBlur={this.handleBlur}
               >
                 Save
-                <span className="nav__keyboard-shortcut">{metaKeyName}+s</span>
+                <span className="nav__keyboard-shortcut">{metaKeyName}+S</span>
               </button>
             </li> }
             { this.props.project.id && this.props.user.authenticated &&
@@ -541,13 +541,13 @@ class Nav extends React.PureComponent {
     return (
       <ul className="nav__items-right" title="user-menu">
         <li className="nav__item">
-          <Link to="/login">
+          <Link to="/login" className="nav__auth-button">
             <span className="nav__item-header">Log in</span>
           </Link>
         </li>
-        <span className="nav__item-spacer">or</span>
+        <span className="nav__item-or">or</span>
         <li className="nav__item">
-          <Link to="/signup">
+          <Link to="/signup" className="nav__auth-button">
             <span className="nav__item-header">Sign up</span>
           </Link>
         </li>

Diff for: client/components/PreviewNav.jsx

@@ -10,7 +10,7 @@ const PreviewNav = ({ owner, project }) => (
   <nav className="nav preview-nav">
     <div className="nav__items-left">
       <div className="nav__item-logo">
-        <InlineSVG src={logoUrl} alt="p5.js logo" />
+        <InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
       </div>
       <Link className="nav__item" to={`/${owner.username}/sketches/${project.id}`}>{project.name}</Link>
       <p className="toolbar__project-owner">by</p>

Diff for: client/components/__test__/FileNode.test.jsx

@@ -24,7 +24,8 @@ describe('<FileNode />', () => {
         showFolderChildren: jest.fn(),
         hideFolderChildren: jest.fn(),
         canEdit: true,
-        authenticated: false
+        authenticated: false,
+        openUploadFileModal: jest.fn()
       };
       component = shallow(<FileNode {...props} />);
     });

Diff for: client/components/__test__/__snapshots__/Nav.test.jsx.snap

@@ -144,7 +144,7 @@ exports[`Nav renders correctly 1`] = `
             <span
               className="nav__keyboard-shortcut"
             >
-              Ctrl
+              ⌃
               +F
             </span>
           </button>
@@ -161,7 +161,7 @@ exports[`Nav renders correctly 1`] = `
             <span
               className="nav__keyboard-shortcut"
             >
-              Ctrl
+              ⌃
               +G
             </span>
           </button>
@@ -180,7 +180,7 @@ exports[`Nav renders correctly 1`] = `
             >
               ⇧
               +
-              Ctrl
+              ⌃
               +G
             </span>
           </button>
@@ -242,7 +242,7 @@ exports[`Nav renders correctly 1`] = `
             <span
               className="nav__keyboard-shortcut"
             >
-              Ctrl
+              ⌃
               +Enter
             </span>
           </button>
@@ -261,7 +261,7 @@ exports[`Nav renders correctly 1`] = `
             >
               ⇧
               +
-              Ctrl
+              ⌃
               +Enter
             </span>
           </button>