diff --git a/.yarn/cache/@reach-auto-id-npm-0.15.3-9ff86f88d5-52f7915970.zip b/.yarn/cache/@reach-auto-id-npm-0.15.3-9ff86f88d5-52f7915970.zip deleted file mode 100644 index 5f276ed42..000000000 Binary files a/.yarn/cache/@reach-auto-id-npm-0.15.3-9ff86f88d5-52f7915970.zip and /dev/null differ diff --git a/.yarn/cache/@reach-descendants-npm-0.15.3-283c02bdf5-7fa392107a.zip b/.yarn/cache/@reach-descendants-npm-0.15.3-283c02bdf5-7fa392107a.zip deleted file mode 100644 index ce6afee72..000000000 Binary files a/.yarn/cache/@reach-descendants-npm-0.15.3-283c02bdf5-7fa392107a.zip and /dev/null differ diff --git a/.yarn/cache/@reach-dropdown-npm-0.15.3-799073bdd1-a556740202.zip b/.yarn/cache/@reach-dropdown-npm-0.15.3-799073bdd1-a556740202.zip deleted file mode 100644 index 4db3af602..000000000 Binary files a/.yarn/cache/@reach-dropdown-npm-0.15.3-799073bdd1-a556740202.zip and /dev/null differ diff --git a/.yarn/cache/@reach-listbox-npm-0.15.3-de26138b7e-3baabcca26.zip b/.yarn/cache/@reach-listbox-npm-0.15.3-de26138b7e-3baabcca26.zip deleted file mode 100644 index 95996864e..000000000 Binary files a/.yarn/cache/@reach-listbox-npm-0.15.3-de26138b7e-3baabcca26.zip and /dev/null differ diff --git a/.yarn/cache/@reach-machine-npm-0.15.3-c1dfe43201-f25a54a397.zip b/.yarn/cache/@reach-machine-npm-0.15.3-c1dfe43201-f25a54a397.zip deleted file mode 100644 index e86a16f84..000000000 Binary files a/.yarn/cache/@reach-machine-npm-0.15.3-c1dfe43201-f25a54a397.zip and /dev/null differ diff --git a/.yarn/cache/@reach-menu-button-npm-0.15.3-9b27128127-7088e0f844.zip b/.yarn/cache/@reach-menu-button-npm-0.15.3-9b27128127-7088e0f844.zip deleted file mode 100644 index 5be01a1f5..000000000 Binary files a/.yarn/cache/@reach-menu-button-npm-0.15.3-9b27128127-7088e0f844.zip and /dev/null differ diff --git a/.yarn/cache/@reach-popover-npm-0.15.3-97da570a54-7bfcef81ac.zip b/.yarn/cache/@reach-popover-npm-0.15.3-97da570a54-7bfcef81ac.zip deleted file mode 100644 index ea24bd74b..000000000 Binary files a/.yarn/cache/@reach-popover-npm-0.15.3-97da570a54-7bfcef81ac.zip and /dev/null differ diff --git a/.yarn/cache/@reach-portal-npm-0.15.3-5cde01ca7c-bdd75ade0c.zip b/.yarn/cache/@reach-portal-npm-0.15.3-5cde01ca7c-bdd75ade0c.zip deleted file mode 100644 index c09f86997..000000000 Binary files a/.yarn/cache/@reach-portal-npm-0.15.3-5cde01ca7c-bdd75ade0c.zip and /dev/null differ diff --git a/.yarn/cache/@reach-rect-npm-0.15.3-1d53a0b3a1-dde47da49c.zip b/.yarn/cache/@reach-rect-npm-0.15.3-1d53a0b3a1-dde47da49c.zip deleted file mode 100644 index 8c83ba984..000000000 Binary files a/.yarn/cache/@reach-rect-npm-0.15.3-1d53a0b3a1-dde47da49c.zip and /dev/null differ diff --git a/.yarn/cache/@reach-utils-npm-0.15.3-4284ae2a2b-387f0ddc53.zip b/.yarn/cache/@reach-utils-npm-0.15.3-4284ae2a2b-387f0ddc53.zip deleted file mode 100644 index 4dac140e5..000000000 Binary files a/.yarn/cache/@reach-utils-npm-0.15.3-4284ae2a2b-387f0ddc53.zip and /dev/null differ diff --git a/.yarn/cache/sn-stylekit-npm-5.2.21-251aee85d2-beb7143618.zip b/.yarn/cache/sn-stylekit-npm-5.2.21-251aee85d2-beb7143618.zip deleted file mode 100644 index 23b8fa920..000000000 Binary files a/.yarn/cache/sn-stylekit-npm-5.2.21-251aee85d2-beb7143618.zip and /dev/null differ diff --git a/packages/components/src/packages/org.standardnotes.markdown-visual-editor/package.json b/packages/components/src/packages/org.standardnotes.markdown-visual-editor/package.json index c7bf6f0ae..2675ffed5 100644 --- a/packages/components/src/packages/org.standardnotes.markdown-visual-editor/package.json +++ b/packages/components/src/packages/org.standardnotes.markdown-visual-editor/package.json @@ -39,6 +39,7 @@ "@milkdown/react": "5.5.0", "@milkdown/theme-nord": "5.5.0", "@standardnotes/editor-kit": "2.2.4", + "@standardnotes/styles": "workspace:*", "@testing-library/dom": "^8.11.3", "@testing-library/jest-dom": "^5.16.2", "@testing-library/react": "^12.1.4", @@ -61,7 +62,6 @@ "react-icons": "^4.3.1", "react-scripts": "^5.0.0", "sass": "*", - "sn-stylekit": "5.2.21", "source-map-explorer": "^2.5.2", "typescript": "*" }, diff --git a/packages/components/src/packages/org.standardnotes.markdown-visual-editor/src/stylesheets/main.scss b/packages/components/src/packages/org.standardnotes.markdown-visual-editor/src/stylesheets/main.scss index e3643ddd4..496031ccd 100644 --- a/packages/components/src/packages/org.standardnotes.markdown-visual-editor/src/stylesheets/main.scss +++ b/packages/components/src/packages/org.standardnotes.markdown-visual-editor/src/stylesheets/main.scss @@ -1,4 +1,4 @@ -@import '~sn-stylekit/dist/stylekit.css'; +@import '../../../../styles/src/Styles/main.scss'; @import 'material-icons/iconfont/material-icons.css'; @import 'katex/dist/katex.min.css'; @import 'prism/material-light.css'; @@ -9,10 +9,7 @@ body, html { - background-color: transparent; - background-color: var(--sn-stylekit-background-color); - font-family: var(--sn-stylekit-sans-serif-font); - font-size: var(--sn-stylekit-font-size-editor); + background-color: var(--sn-stylekit-secondary-background-color); height: 100%; margin: 0; padding: 0; diff --git a/yarn.lock b/yarn.lock index 745f08b65..7526f5742 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3976,19 +3976,6 @@ __metadata: languageName: node linkType: hard -"@reach/auto-id@npm:0.15.3": - version: 0.15.3 - resolution: "@reach/auto-id@npm:0.15.3" - dependencies: - "@reach/utils": 0.15.3 - tslib: ^2.3.0 - peerDependencies: - react: ^16.8.0 || 17.x - react-dom: ^16.8.0 || 17.x - checksum: 52f7915970f8de51b923274964bb18e61adf147845e2cb65ff93f17ebf4179f3cc743d6f791da64801447de5965b10e3a2c48c1debbcb5ab85bb1fd73a5fa61a - languageName: node - linkType: hard - "@reach/auto-id@npm:0.16.0": version: 0.16.0 resolution: "@reach/auto-id@npm:0.16.0" @@ -4032,19 +4019,6 @@ __metadata: languageName: node linkType: hard -"@reach/descendants@npm:0.15.3": - version: 0.15.3 - resolution: "@reach/descendants@npm:0.15.3" - dependencies: - "@reach/utils": 0.15.3 - tslib: ^2.3.0 - peerDependencies: - react: ^16.8.0 || 17.x - react-dom: ^16.8.0 || 17.x - checksum: 7fa392107a07bdd2f28cda52f9ffc674cbe14a7b4e2d3a4dc8a76f45883a2cd9ff55f4a367a044e0860c3315f01165c99815d472b32976ec35b3115c59b760f4 - languageName: node - linkType: hard - "@reach/descendants@npm:0.16.1": version: 0.16.1 resolution: "@reach/descendants@npm:0.16.1" @@ -4104,22 +4078,6 @@ __metadata: languageName: node linkType: hard -"@reach/dropdown@npm:0.15.3": - version: 0.15.3 - resolution: "@reach/dropdown@npm:0.15.3" - dependencies: - "@reach/auto-id": 0.15.3 - "@reach/descendants": 0.15.3 - "@reach/popover": 0.15.3 - "@reach/utils": 0.15.3 - tslib: ^2.3.0 - peerDependencies: - react: ^16.8.0 || 17.x - react-dom: ^16.8.0 || 17.x - checksum: a556740202c34dc5633440cf30d38d352cc76f38ba652c4882a501f07534d51c82cc71b69bd21d4862fe156dbe10ba35016ec4eca3232da0998be938aca4e000 - languageName: node - linkType: hard - "@reach/dropdown@npm:0.16.2": version: 0.16.2 resolution: "@reach/dropdown@npm:0.16.2" @@ -4152,23 +4110,6 @@ __metadata: languageName: node linkType: hard -"@reach/listbox@npm:^0.15.0": - version: 0.15.3 - resolution: "@reach/listbox@npm:0.15.3" - dependencies: - "@reach/auto-id": 0.15.3 - "@reach/descendants": 0.15.3 - "@reach/machine": 0.15.3 - "@reach/popover": 0.15.3 - "@reach/utils": 0.15.3 - prop-types: ^15.7.2 - peerDependencies: - react: ^16.8.0 || 17.x - react-dom: ^16.8.0 || 17.x - checksum: 3baabcca26240cb726f02be1bfc68f0053e47b6c7f5fe4841a22883e4c2a71d403a954195bb0a51a6a4f72c71621a15afc16c4f59fdd5a1f977a843a768d1e30 - languageName: node - linkType: hard - "@reach/listbox@npm:^0.16.2": version: 0.16.2 resolution: "@reach/listbox@npm:0.16.2" @@ -4203,20 +4144,6 @@ __metadata: languageName: node linkType: hard -"@reach/machine@npm:0.15.3": - version: 0.15.3 - resolution: "@reach/machine@npm:0.15.3" - dependencies: - "@reach/utils": 0.15.3 - "@xstate/fsm": 1.4.0 - tslib: ^2.3.0 - peerDependencies: - react: ^16.8.0 || 17.x - react-dom: ^16.8.0 || 17.x - checksum: f25a54a397dcdda674207a4477b8166addd82e0f427e088bf677875654659400d7013ec1583db83a6dc881402fc3b6b519a72fad68102cbc610c269636ecea6c - languageName: node - linkType: hard - "@reach/machine@npm:0.16.0": version: 0.16.0 resolution: "@reach/machine@npm:0.16.0" @@ -4263,23 +4190,6 @@ __metadata: languageName: node linkType: hard -"@reach/menu-button@npm:^0.15.1": - version: 0.15.3 - resolution: "@reach/menu-button@npm:0.15.3" - dependencies: - "@reach/dropdown": 0.15.3 - "@reach/popover": 0.15.3 - "@reach/utils": 0.15.3 - prop-types: ^15.7.2 - tiny-warning: ^1.0.3 - tslib: ^2.3.0 - peerDependencies: - react: ^16.8.0 || 17.x - react-dom: ^16.8.0 || 17.x - checksum: 7088e0f8443a8aaf763f8da38d74f4f9ed87ad1af4a0ac7a64d7ddc1a1b64f7af26fdb05b4fdb131e52933e414505855a7a1afe5155d300d4072651466a3fe05 - languageName: node - linkType: hard - "@reach/menu-button@npm:^0.17.0": version: 0.17.0 resolution: "@reach/menu-button@npm:0.17.0" @@ -4305,22 +4215,6 @@ __metadata: languageName: node linkType: hard -"@reach/popover@npm:0.15.3": - version: 0.15.3 - resolution: "@reach/popover@npm:0.15.3" - dependencies: - "@reach/portal": 0.15.3 - "@reach/rect": 0.15.3 - "@reach/utils": 0.15.3 - tabbable: ^4.0.0 - tslib: ^2.3.0 - peerDependencies: - react: ^16.8.0 || 17.x - react-dom: ^16.8.0 || 17.x - checksum: 7bfcef81ac5607bcdc6eefe0cee554a1274a4fa2929402ab6a9f5de109ebe7db26ee19774509e6a5fda2f3697f10fe4dc3c62b5d5dd4e9ec106082a64b9f8fb3 - languageName: node - linkType: hard - "@reach/popover@npm:0.16.2": version: 0.16.2 resolution: "@reach/popover@npm:0.16.2" @@ -4353,19 +4247,6 @@ __metadata: languageName: node linkType: hard -"@reach/portal@npm:0.15.3": - version: 0.15.3 - resolution: "@reach/portal@npm:0.15.3" - dependencies: - "@reach/utils": 0.15.3 - tslib: ^2.3.0 - peerDependencies: - react: ^16.8.0 || 17.x - react-dom: ^16.8.0 || 17.x - checksum: bdd75ade0cf4ab1ed4d31db294c7901c308d009bdfd2ff2c9a18c854e1cfad3f484c444d8a770af031f19eecb795117be4f0b0361fd3ab15fe3a6a52afea756e - languageName: node - linkType: hard - "@reach/portal@npm:0.16.2": version: 0.16.2 resolution: "@reach/portal@npm:0.16.2" @@ -4394,22 +4275,6 @@ __metadata: languageName: node linkType: hard -"@reach/rect@npm:0.15.3": - version: 0.15.3 - resolution: "@reach/rect@npm:0.15.3" - dependencies: - "@reach/observe-rect": 1.2.0 - "@reach/utils": 0.15.3 - prop-types: ^15.7.2 - tiny-warning: ^1.0.3 - tslib: ^2.3.0 - peerDependencies: - react: ^16.8.0 || 17.x - react-dom: ^16.8.0 || 17.x - checksum: dde47da49c88b9db0967a1906daecce6054e569079a5122c5de7601f52750cbeeb7d4eacaeb9042548b3754ddd624c75c7f2a63d57737e33c7d814f532b65f73 - languageName: node - linkType: hard - "@reach/rect@npm:0.16.0": version: 0.16.0 resolution: "@reach/rect@npm:0.16.0" @@ -4461,19 +4326,6 @@ __metadata: languageName: node linkType: hard -"@reach/utils@npm:0.15.3": - version: 0.15.3 - resolution: "@reach/utils@npm:0.15.3" - dependencies: - tiny-warning: ^1.0.3 - tslib: ^2.3.0 - peerDependencies: - react: ^16.8.0 || 17.x - react-dom: ^16.8.0 || 17.x - checksum: 387f0ddc5375590ced9d6a90a84d39a30bd11b8d39eaff6cbb005415b44c011861c897111e7734562916172b2ec2114111d3f0952b5795faf43822bc44ae3f14 - languageName: node - linkType: hard - "@reach/utils@npm:0.16.0": version: 0.16.0 resolution: "@reach/utils@npm:0.16.0" @@ -5632,6 +5484,7 @@ __metadata: "@milkdown/react": 5.5.0 "@milkdown/theme-nord": 5.5.0 "@standardnotes/editor-kit": 2.2.4 + "@standardnotes/styles": "workspace:*" "@testing-library/dom": ^8.11.3 "@testing-library/jest-dom": ^5.16.2 "@testing-library/react": ^12.1.4 @@ -5654,7 +5507,6 @@ __metadata: react-icons: ^4.3.1 react-scripts: ^5.0.0 sass: "*" - sn-stylekit: 5.2.21 source-map-explorer: ^2.5.2 typescript: "*" languageName: unknown @@ -28997,19 +28849,6 @@ __metadata: languageName: node linkType: hard -"sn-stylekit@npm:5.2.21": - version: 5.2.21 - resolution: "sn-stylekit@npm:5.2.21" - dependencies: - "@reach/listbox": ^0.15.0 - "@reach/menu-button": ^0.15.1 - prop-types: ^15.7.2 - peerDependencies: - preact: ^10.5.12 - checksum: beb7143618c03060794db9d0cb3c6a9d5b7b33b3ada921dc0a5ffa432ed3b01defc5153b990cec8c8f8017ed6380cee4acee51c71a8a7b78fd42fff11c68b77b - languageName: node - linkType: hard - "sn-stylekit@npm:^2.1.1": version: 2.2.1 resolution: "sn-stylekit@npm:2.2.1"