Merge branch 'master' of github.com:trouble/payload into typescript/datePicker

2020-12-29 12:48:24 -05:00
parent 5100fd35dc d10954b788
commit 34153dc85b
22 changed files with 400 additions and 57 deletions
--- a/src/admin/scss/app.scss
+++ b/src/admin/scss/app.scss
@@ -124,3 +124,5 @@ dialog {
 .payload__modal-item--enterDone {
  z-index: $z-modal;
 }
+
+@import '~payload-user-css';
--- a/src/admin/scss/custom.css
+++ b/src/admin/scss/custom.css
@@ -0,0 +1 @@
+/* Used as a placeholder for when the Payload app does not have custom CSS */
--- a/src/admin/scss/overrides.scss
+++ b/src/admin/scss/overrides.scss
@@ -0,0 +1 @@
+/* Used as a placeholder for when the Payload app does not have custom SCSS */
				`@@ -0,0 +1 @@`
				`/* Used as a placeholder for when the Payload app does not have custom CSS */`