r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

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

Browse source
This commit is contained in:
Andrew Nicolaou 2019-11-25 10:55:30 +01:00
commit 8adb1347ba
6 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/modules/User/pages/DashboardView.jsx
View file

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

1
client/styles/components/_asset-size.scss
View file

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

24
client/styles/components/_collection.scss
View file

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

10
client/styles/components/_dashboard-header.scss
View file

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

2
client/styles/components/_nav.scss
View file

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

3
client/styles/layout/_dashboard.scss
View file

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