Merge branch 'feature/sketch-collections' of https://github.com/andrewn/p5.js-web-editor into feature/sketch-collections

client/modules/User/pages/DashboardView.jsx

@@ -79,17 +79,17 @@ class DashboardView extends React.Component {
       case TabKey.collections:
         return this.isOwner() && (
           <React.Fragment>
-            <CollectionSearchbar />
             <Link className="dashboard__action-button" to={`/${username}/collections/create`}>
               Create collection
             </Link>
+            <CollectionSearchbar />
           </React.Fragment>);
       case TabKey.sketches:
       default:
         return (
           <React.Fragment>
-            <SketchSearchbar />
             {this.isOwner() && <Link className="dashboard__action-button" to="/">New sketch</Link>}
+            <SketchSearchbar />
           </React.Fragment>
         );
     }

client/styles/components/_asset-size.scss

@@ -1,5 +1,6 @@
 .asset-size {
   font-size: #{14 / $base-font-size}rem;
+  margin-bottom: #{18 / $base-font-size}rem;
 }
 
 .asset-size-bar {

client/styles/components/_collection.scss

@@ -1,11 +1,14 @@
 .collection-container {
-  width: 1012px;
-  margin: 0 auto;
+  padding: #{24 / $base-font-size}rem #{66 / $base-font-size}rem;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
 }
 
 .collection-metadata {
-  margin: 0px #{56 / $base-font-size}rem;
-  padding: #{24 / $base-font-size}rem 0;
+  width: #{1012 / $base-font-size}rem;
+  margin: 0 auto;
+  margin-bottom: #{24 / $base-font-size}rem;
 }
 
 .collection-metadata__columns {
@@ -30,7 +33,7 @@
 }
 
 .collection-metadata__name {
-  padding: #{8 / $base-font-size}rem 0;
+  // padding: #{8 / $base-font-size}rem 0;
 }
 
 .collection-metadata__name .editable-input__label span {
@@ -57,7 +60,7 @@
 }
 
 .collection-metadata__description {
-  padding-top: #{8 / $base-font-size}rem;
+  margin-top: #{8 / $base-font-size}rem;
   text-align: left;
   font-size: 14px;
 }
@@ -74,10 +77,6 @@
   width: 100%;
 }
 
-.collection-table-wrapper {
-  margin: #{28 / $base-font-size}rem #{56 / $base-font-size}rem;
-}
-
 .collection-add-sketch {
   min-width: #{600 / $base-font-size}rem;
   overflow: scroll;
@@ -106,8 +105,9 @@
 }
 
 .collection-table-wrapper {
-  min-height: 100%;
-
+  width: #{1012 / $base-font-size}rem;
+  margin: 0 auto;
+  flex: 1;
   @include themify() {
     border: 1px solid getThemifyVariable('modal-border-color');
   }

client/styles/components/_dashboard-header.scss

@@ -7,6 +7,12 @@
   flex-direction:column;
 }
 
+.dashboard-header__header {
+  max-width: #{1012 / $base-font-size}rem;
+  margin: 0 auto;
+  width: 100%;
+}
+
 .dashboard-header--no-vertical-padding {
   padding: 0 66px;
 }
@@ -70,8 +76,8 @@
 .dashboard-header__actions {
   display: flex;
   align-items: center;
-  margin-bottom: #{24 / $base-font-size}rem;
-  padding: #{24 / $base-font-size}rem #{10 / $base-font-size}rem;
+  padding: #{24 / $base-font-size}rem 0;
+  justify-content: space-between;
 }
 
 .dashboard-header__actions > *:not(:first-child) {

client/styles/components/_nav.scss

@@ -109,7 +109,7 @@
   padding-right: #{20 / $base-font-size}rem;
 
   & .nav__dropdown {
-    width: #{121 / $base-font-size}rem;
+    width: #{122 / $base-font-size}rem;
   }
 }
 

client/styles/layout/_dashboard.scss

@@ -14,6 +14,9 @@
   flex-direction: column;
   flex: 1;
   overflow: hidden;
+  max-width: #{1012 / $base-font-size}rem;
+  margin: 0 auto;
+  width: 100%;
 
   @include themify() {
     border: 1px solid getThemifyVariable('modal-border-color');