diff --git a/package.json b/package.json index 44da652..32077e7 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "@babel/preset-env": "^7.0.0", "@jupyterlab/builder": "^4.0.0", "@jupyterlab/testutils": "^4.0.0", - "@myst-theme/styles": "^0.5.21", + "@myst-theme/styles": "^0.5.22", "@tailwindcss/typography": "^0.5.8", "@types/jest": "^29.2.0", "@types/json-schema": "^7.0.11", diff --git a/style/jupyterlab-typography.css b/style/jupyterlab-typography.css index 717be40..63eb5c6 100644 --- a/style/jupyterlab-typography.css +++ b/style/jupyterlab-typography.css @@ -33,9 +33,6 @@ .myst { @apply prose prose-stone dark:prose-invert break-words max-w-none w-full overflow-auto; - font-size: var(--jp-content-font-size1); - color: var(--jp-content-font-color1); - /* Comes from .jp-RenderedHTMLCommon */ padding-right: 20px; } diff --git a/style/preflight.css b/style/preflight.css index c23e41d..f173e28 100644 --- a/style/preflight.css +++ b/style/preflight.css @@ -5,6 +5,11 @@ /* This is a highly simplified version of https://tailwindcss.com/docs/preflight to work with JupyterLab */ +.myst { + font-size: var(--jp-content-font-size1); + color: var(--jp-content-font-color1); +} + .myst :where(*):not( :where([class~='jp-RenderedHTMLCommon'], [class~='jp-RenderedHTMLCommon'] *) @@ -47,3 +52,7 @@ display: block; max-width: 100%; } + +.myst :where(button, input, optgroup, select, textarea) { + color: inherit; /* 1 */ +} diff --git a/ui-tests/tests/files-run.spec.ts-snapshots/File-Run-View-Markdown-file-and-render-result-1-linux.png b/ui-tests/tests/files-run.spec.ts-snapshots/File-Run-View-Markdown-file-and-render-result-1-linux.png index 8b625e5..45c0f3e 100644 Binary files a/ui-tests/tests/files-run.spec.ts-snapshots/File-Run-View-Markdown-file-and-render-result-1-linux.png and b/ui-tests/tests/files-run.spec.ts-snapshots/File-Run-View-Markdown-file-and-render-result-1-linux.png differ diff --git a/ui-tests/tests/notebook-run.spec.ts-snapshots/Notebook-Run-Run-Notebook-and-capture-cell-outputs-1-linux.png b/ui-tests/tests/notebook-run.spec.ts-snapshots/Notebook-Run-Run-Notebook-and-capture-cell-outputs-1-linux.png index a4e36cf..d4cdad7 100644 Binary files a/ui-tests/tests/notebook-run.spec.ts-snapshots/Notebook-Run-Run-Notebook-and-capture-cell-outputs-1-linux.png and b/ui-tests/tests/notebook-run.spec.ts-snapshots/Notebook-Run-Run-Notebook-and-capture-cell-outputs-1-linux.png differ diff --git a/ui-tests/yarn.lock b/ui-tests/yarn.lock index d831067..de49ac8 100644 --- a/ui-tests/yarn.lock +++ b/ui-tests/yarn.lock @@ -1385,14 +1385,14 @@ __metadata: languageName: node linkType: hard -"@playwright/test@npm:1.38.0": - version: 1.38.0 - resolution: "@playwright/test@npm:1.38.0" +"@playwright/test@npm:^1.32.2, @playwright/test@npm:^1.37.0": + version: 1.41.2 + resolution: "@playwright/test@npm:1.41.2" dependencies: - playwright: 1.38.0 + playwright: 1.41.2 bin: playwright: cli.js - checksum: 0768b6b98f0993d9d8017e4bcca3a5c3fe1bf0270acaa89b141479c4319c16350d60e6d2511cbd655283942059fa409ce23fce30435f0936f5e2577834f356ba + checksum: 87d9e725106111b2af1b2dec32454cd2a2d9665ff735669dc751caa30240e6db595ecfb9422719fa65dcff6ca19dea93ac2ae70d587efddde31def0754549d4c languageName: node linkType: hard @@ -3101,27 +3101,27 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.38.0": - version: 1.38.0 - resolution: "playwright-core@npm:1.38.0" +"playwright-core@npm:1.41.2": + version: 1.41.2 + resolution: "playwright-core@npm:1.41.2" bin: playwright-core: cli.js - checksum: 9eb43fc6c3cb392d5f35b0fd0b7291b38a8cbdc3cbb944a8261f744f30d09196dfa3b5d84aa02ffc09af87d08d31b385b007b6af20d0b6cd50a29344f3b0db8d + checksum: b41ede0db3fd3e3f7e0b0efbdfb2dbc4db345e113cf9c4451af21d1d5b5d9ab5e969f5662852925e37b2198ae5daab92aa48108fe3d4eb81c849ba8752aaf8cc languageName: node linkType: hard -"playwright@npm:1.38.0": - version: 1.38.0 - resolution: "playwright@npm:1.38.0" +"playwright@npm:1.41.2": + version: 1.41.2 + resolution: "playwright@npm:1.41.2" dependencies: fsevents: 2.3.2 - playwright-core: 1.38.0 + playwright-core: 1.41.2 dependenciesMeta: fsevents: optional: true bin: playwright: cli.js - checksum: c5356690a391d5dd41f814d4e2694b93ba9e79381ce63de752da1c6c59b1f9c69bc6be853d973d0542d73a44a6b15f7c0081a164a64cd27b6b31207710c0ab34 + checksum: acf166003ec42cd795f5fca096c5135880d78e84ec2d0a1911b2cab984cf75dc06e50d3aa24b56cbcbc5369ca8c61831e76c5f8674531a272fbd0f6e624fa387 languageName: node linkType: hard diff --git a/yarn.lock b/yarn.lock index 4115727..4c48f22 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3230,10 +3230,10 @@ __metadata: languageName: node linkType: hard -"@myst-theme/styles@npm:^0.5.21": - version: 0.5.21 - resolution: "@myst-theme/styles@npm:0.5.21" - checksum: 69213bad0c157914b557e94330b88c5505090096e7d0d8b8d71c7f98ecb4559b8ddedc4e5d06ee9a45766a146c51a2651ff51ea9c15f15c219a0b5b9b98cbb74 +"@myst-theme/styles@npm:^0.5.22": + version: 0.5.22 + resolution: "@myst-theme/styles@npm:0.5.22" + checksum: be0d2e9a0f9bd1252848a12aca8ac2d5c88b9473070450d09c5314787c93175b7f34a8712e5ddd82dd832cafce7587437dce3c7de0ebd34b3fa2d5dc2b0bef15 languageName: node linkType: hard @@ -9016,7 +9016,7 @@ __metadata: "@myst-theme/diagrams": ^0.5.22 "@myst-theme/frontmatter": ^0.5.22 "@myst-theme/providers": ^0.5.22 - "@myst-theme/styles": ^0.5.21 + "@myst-theme/styles": ^0.5.22 "@tailwindcss/typography": ^0.5.8 "@types/jest": ^29.2.0 "@types/json-schema": ^7.0.11