diff --git a/demo/client/components.js b/demo/client/components.js index 6a5595768..39aa96cf6 100644 --- a/demo/client/components.js +++ b/demo/client/components.js @@ -2,7 +2,7 @@ import PageList from '../collections/Page/components/List'; const components = { pages: { - // List: PageList, + List: PageList, }, }; diff --git a/demo/collections/Page/components/List/index.js b/demo/collections/Page/components/List/index.js index e43b753a3..f36e03d9b 100644 --- a/demo/collections/Page/components/List/index.js +++ b/demo/collections/Page/components/List/index.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import DefaultTemplate from 'payload/client/components/layout/DefaultTemplate'; +import DefaultTemplate from '../../../../../src/client/components/layout/DefaultTemplate'; import './index.scss'; @@ -18,6 +18,7 @@ const PageListView = (props) => { >
This is a custom Pages list view
+Sup
); }; diff --git a/demo/collections/Page/components/List/index.scss b/demo/collections/Page/components/List/index.scss index 96b26bcff..5b0152867 100644 --- a/demo/collections/Page/components/List/index.scss +++ b/demo/collections/Page/components/List/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../../../src/client/scss/styles.scss'; .collection-list { .heading-button { diff --git a/demo/collections/Page/index.js b/demo/collections/Page/index.js index 33dd2afe4..5a120d23f 100644 --- a/demo/collections/Page/index.js +++ b/demo/collections/Page/index.js @@ -122,8 +122,5 @@ module.exports = { ], }, ], - components: { - // List, - }, timestamps: true, }; diff --git a/demo/payload.config.js b/demo/payload.config.js index 01126594c..62c09f648 100644 --- a/demo/payload.config.js +++ b/demo/payload.config.js @@ -16,12 +16,10 @@ module.exports = { port: 3000, serverURL: 'http://localhost:3000', cors: ['http://localhost', 'http://localhost:8080', 'http://localhost:8081'], - adminURL: '/payload-login', routes: { api: '/api', admin: '/admin', }, - plugins: [], compression: {}, paths: { scssOverrides: path.resolve(__dirname, 'client/scss/overrides.scss'), diff --git a/src/client/components/controls/Button/index.scss b/src/client/components/controls/Button/index.scss index 7209b096d..8f28a26cd 100644 --- a/src/client/components/controls/Button/index.scss +++ b/src/client/components/controls/Button/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .btn { @extend %uppercase-label; diff --git a/src/client/components/forms/Form/index.scss b/src/client/components/forms/Form/index.scss index d8d3789a3..7ecf57f80 100644 --- a/src/client/components/forms/Form/index.scss +++ b/src/client/components/forms/Form/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .form { @include row; diff --git a/src/client/components/forms/Label/index.scss b/src/client/components/forms/Label/index.scss index a43dd58cd..e7f31244d 100644 --- a/src/client/components/forms/Label/index.scss +++ b/src/client/components/forms/Label/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; label.field-label { display: flex; diff --git a/src/client/components/forms/Submit/index.scss b/src/client/components/forms/Submit/index.scss index d57e1c9dd..80fc95bd8 100644 --- a/src/client/components/forms/Submit/index.scss +++ b/src/client/components/forms/Submit/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; form > .form-submit { @include gutter; diff --git a/src/client/components/forms/field-types/Email/index.scss b/src/client/components/forms/field-types/Email/index.scss index 955bd1cfe..0d98ff51a 100644 --- a/src/client/components/forms/field-types/Email/index.scss +++ b/src/client/components/forms/field-types/Email/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../../scss/styles.scss'; @import '../shared'; .field-type.email { diff --git a/src/client/components/forms/field-types/Number/index.scss b/src/client/components/forms/field-types/Number/index.scss index d1bce7dfb..f14565eec 100644 --- a/src/client/components/forms/field-types/Number/index.scss +++ b/src/client/components/forms/field-types/Number/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../../scss/styles.scss'; @import '../shared'; .field-type.number { diff --git a/src/client/components/forms/field-types/Password/index.scss b/src/client/components/forms/field-types/Password/index.scss index dd4e20a1f..ef6ec56c2 100644 --- a/src/client/components/forms/field-types/Password/index.scss +++ b/src/client/components/forms/field-types/Password/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../../scss/styles.scss'; @import '../shared'; .field-type.password { diff --git a/src/client/components/forms/field-types/Text/index.scss b/src/client/components/forms/field-types/Text/index.scss index b9d8d36f6..4795f8a8e 100644 --- a/src/client/components/forms/field-types/Text/index.scss +++ b/src/client/components/forms/field-types/Text/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../../scss/styles.scss'; @import '../shared'; .field-type.text { diff --git a/src/client/components/forms/field-types/Textarea/index.scss b/src/client/components/forms/field-types/Textarea/index.scss index c9a38ff5c..b4fd9c476 100644 --- a/src/client/components/forms/field-types/Textarea/index.scss +++ b/src/client/components/forms/field-types/Textarea/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../../scss/styles.scss'; @import '../shared'; .field-type.textarea { diff --git a/src/client/components/forms/useFieldType/index.scss b/src/client/components/forms/useFieldType/index.scss index 197514f9e..bd5620e9e 100644 --- a/src/client/components/forms/useFieldType/index.scss +++ b/src/client/components/forms/useFieldType/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .field-type { @include gutter; diff --git a/src/client/components/layout/ContentBlock/index.scss b/src/client/components/layout/ContentBlock/index.scss index aaf5aced6..ab664f60d 100644 --- a/src/client/components/layout/ContentBlock/index.scss +++ b/src/client/components/layout/ContentBlock/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .content-block { max-width: $content-width; diff --git a/src/client/components/layout/DefaultTemplate/index.scss b/src/client/components/layout/DefaultTemplate/index.scss index 98d68cbdd..cb9a45db0 100644 --- a/src/client/components/layout/DefaultTemplate/index.scss +++ b/src/client/components/layout/DefaultTemplate/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .default-template { padding: $base; diff --git a/src/client/components/layout/Section/index.scss b/src/client/components/layout/Section/index.scss index deeaca87e..0ada78cff 100644 --- a/src/client/components/layout/Section/index.scss +++ b/src/client/components/layout/Section/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; section.section { @extend %shadow; diff --git a/src/client/components/layout/Sidebar/index.scss b/src/client/components/layout/Sidebar/index.scss index 73e397770..2abf2d719 100644 --- a/src/client/components/layout/Sidebar/index.scss +++ b/src/client/components/layout/Sidebar/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .sidebar { position: fixed; diff --git a/src/client/components/layout/Sticky/index.scss b/src/client/components/layout/Sticky/index.scss index 64a5c19db..e63aeee95 100644 --- a/src/client/components/layout/Sticky/index.scss +++ b/src/client/components/layout/Sticky/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .sticky { z-index: 10; diff --git a/src/client/components/layout/Table/index.scss b/src/client/components/layout/Table/index.scss index 0ed114ffd..31aeda0e9 100644 --- a/src/client/components/layout/Table/index.scss +++ b/src/client/components/layout/Table/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; table { width: 100%; diff --git a/src/client/components/modules/APIUrl/index.scss b/src/client/components/modules/APIUrl/index.scss index f2531c7d9..e869b2666 100644 --- a/src/client/components/modules/APIUrl/index.scss +++ b/src/client/components/modules/APIUrl/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .api-url { .url { diff --git a/src/client/components/modules/Localizer/index.scss b/src/client/components/modules/Localizer/index.scss index a0339f241..27ae784ea 100644 --- a/src/client/components/modules/Localizer/index.scss +++ b/src/client/components/modules/Localizer/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .localizer { position: relative; diff --git a/src/client/components/modules/Pagination/PaginationNode/index.scss b/src/client/components/modules/Pagination/PaginationNode/index.scss index 2fd9dc20f..06e548e1f 100644 --- a/src/client/components/modules/Pagination/PaginationNode/index.scss +++ b/src/client/components/modules/Pagination/PaginationNode/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../../scss/styles.scss'; .pagination-node { @extend %btn-reset; diff --git a/src/client/components/modules/Pagination/index.scss b/src/client/components/modules/Pagination/index.scss index 92b3c0f7e..a8ecb183b 100644 --- a/src/client/components/modules/Pagination/index.scss +++ b/src/client/components/modules/Pagination/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .pagination { margin-top: base(.5); diff --git a/src/client/components/modules/Status/index.scss b/src/client/components/modules/Status/index.scss index 505c363c2..644f2873b 100644 --- a/src/client/components/modules/Status/index.scss +++ b/src/client/components/modules/Status/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .status-list { @include gutter; diff --git a/src/client/components/modules/StepNav/index.scss b/src/client/components/modules/StepNav/index.scss index 283e0cf50..1c625d8c9 100644 --- a/src/client/components/modules/StepNav/index.scss +++ b/src/client/components/modules/StepNav/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .step-nav { display: flex; diff --git a/src/client/components/modules/StickyHeader/index.scss b/src/client/components/modules/StickyHeader/index.scss index 925d5cd16..cd6eb3ad6 100644 --- a/src/client/components/modules/StickyHeader/index.scss +++ b/src/client/components/modules/StickyHeader/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .sticky-header { @include gutter; diff --git a/src/client/components/modules/Tooltip/index.scss b/src/client/components/modules/Tooltip/index.scss index 5627486d2..981ae3a7e 100644 --- a/src/client/components/modules/Tooltip/index.scss +++ b/src/client/components/modules/Tooltip/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../scss/styles.scss'; .tooltip { @extend %uppercase-label; diff --git a/src/client/components/views/collections/Edit/index.scss b/src/client/components/views/collections/Edit/index.scss index e13669be5..198c7b003 100644 --- a/src/client/components/views/collections/Edit/index.scss +++ b/src/client/components/views/collections/Edit/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../../scss/styles.scss'; .collection-edit { &__header { diff --git a/src/client/components/views/collections/List/index.scss b/src/client/components/views/collections/List/index.scss index 96b26bcff..a383a047b 100644 --- a/src/client/components/views/collections/List/index.scss +++ b/src/client/components/views/collections/List/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../../scss/styles.scss'; .collection-list { .heading-button { diff --git a/src/client/components/views/globals/Edit/index.scss b/src/client/components/views/globals/Edit/index.scss index e1a41c55d..9ed63e630 100644 --- a/src/client/components/views/globals/Edit/index.scss +++ b/src/client/components/views/globals/Edit/index.scss @@ -1,4 +1,4 @@ -@import '~payload/client/scss/styles'; +@import '../../../../scss/vars.scss'; .global-edit { &__header {