diff --git a/.nvmrc b/.nvmrc index 3c032078..2bd5a0a9 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18 +22 diff --git a/demo/.storybook/main.ts b/demo/.storybook/main.ts index 1ff5d365..e9ddf0c7 100644 --- a/demo/.storybook/main.ts +++ b/demo/.storybook/main.ts @@ -74,17 +74,13 @@ const config: StorybookConfig = { if (sassLoader) { sassLoader.options = sassLoader.options || {}; + sassLoader.options.api = 'modern'; sassLoader.options.sassOptions = sassLoader.options.sassOptions || {}; - sassLoader.options.sassOptions.importer = (file: string) => { - if (!file.startsWith('@diplodoc/components')) { - return {file}; - } - - const root = dirname(dirname(__dirname)); - const pkg = require(join(root, '/package.json')); - - return {file: join(root, pkg.exports['.'].import.style)}; - }; + sassLoader.options.sassOptions.loadPaths = [ + join(dirname(require.resolve('@diplodoc/transform/package.json')), 'dist/scss'), + join(__dirname, '../node_modules'), + dirname(dirname(__dirname)), // project root for @diplodoc/components + ]; } return config; diff --git a/demo/package-lock.json b/demo/package-lock.json index 9f679113..22e70173 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@diplodoc/transform": "^4.26.0", + "@diplodoc/transform": "^4.64.0", "bem-cn-lite": "^4.1.0", "prop-types": "^15.8.1", "react": "^18.2.0", @@ -30,7 +30,7 @@ "@storybook/react-webpack5": "^7.6.17", "@storybook/testing-library": "^0.2.0", "@svgr/webpack": "^8.1.0", - "sass": "^1.66.1", + "sass": "^1.80.6", "storybook": "^7.6.17" } }, @@ -81,7 +81,6 @@ "version": "7.25.2", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.24.7", @@ -1944,11 +1943,44 @@ "node": ">=0.1.90" } }, + "node_modules/@diplodoc/cut-extension": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@diplodoc/cut-extension/-/cut-extension-1.1.0.tgz", + "integrity": "sha512-dgkcwtdABnJAygG3YtNetcZIRp2E/DMV03peNUlzFttGfDjgMg8MLT1XH4hKzqJeVCFooZ71FcwOuy1Idttbxg==", + "license": "MIT", + "dependencies": { + "@diplodoc/directive": "^0.3.0", + "@diplodoc/utils": "^2.0.1" + } + }, + "node_modules/@diplodoc/directive": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@diplodoc/directive/-/directive-0.3.3.tgz", + "integrity": "sha512-QojMfwlyjg0uhPd7I/roIkBYDDBsNkYmHPr7nzkHEGYC/nszJy/4NuWshzB10YW3CbWSO9BUwCk6XoZXgTrKZg==", + "license": "MIT", + "dependencies": { + "markdown-it-directive": "^2.0.6" + } + }, + "node_modules/@diplodoc/file-extension": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@diplodoc/file-extension/-/file-extension-0.2.1.tgz", + "integrity": "sha512-4m9ZcQwmeHw0t2t5vv5GGxKfUifOdpf4Idb9a/Rfkxl6pqGnk0rnZ0xwXrruQEwinkQIBL4TCl2YN3SKGaBrjQ==", + "license": "MIT", + "dependencies": { + "@diplodoc/directive": "^0.3.0" + }, + "peerDependencies": { + "markdown-it": "^13.0.0" + } + }, "node_modules/@diplodoc/tabs-extension": { - "version": "3.2.0", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/@diplodoc/tabs-extension/-/tabs-extension-3.7.4.tgz", + "integrity": "sha512-5az1l4tqyktOhvLfRliyRh9nRZSnSMlv6+R71DogOSmZFkahzS+Tj82xlB4ut8+5LLWl28VNM+LkyeJin6SVhw==", "license": "MIT", "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "react": { @@ -1957,12 +1989,17 @@ } }, "node_modules/@diplodoc/transform": { - "version": "4.26.0", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@diplodoc/transform/-/transform-4.64.0.tgz", + "integrity": "sha512-TUIy2JrpfmYcz7QOFCHN7bWCVv0HJTNlw+Eq5hRNqJ6W49wVVkKigobpmyROeXsVSaExSyxS22qYwfY33MfDyw==", "license": "MIT", "dependencies": { - "@diplodoc/tabs-extension": "^3.0.0", + "@diplodoc/cut-extension": "^1.1.0", + "@diplodoc/file-extension": "^0.2.1", + "@diplodoc/tabs-extension": "^3.7.4", + "@diplodoc/utils": "^2.1.0", "chalk": "^4.1.2", - "cheerio": "^1.0.0-rc.12", + "cheerio": "^1.0.0", "css": "^3.0.0", "cssfilter": "0.0.10", "get-root-node-polyfill": "1.0.0", @@ -1970,15 +2007,16 @@ "js-yaml": "^4.1.0", "lodash": "4.17.21", "markdown-it": "^13.0.2", - "markdown-it-attrs": "4.1.4", + "markdown-it-attrs": "^4.2.0", "markdown-it-deflist": "2.1.0", - "markdown-it-meta": "0.0.1", "markdown-it-sup": "1.0.0", "markdownlint": "^0.32.1", "markdownlint-rule-helpers": "0.17.2", + "quick-lru": "^5.1.1", "sanitize-html": "^2.11.0", - "slugify": "1.6.5", - "svgo": "^3.2.0" + "slugify": "1.6.6", + "svgo": "^3.2.0", + "ts-dedent": "^2.2.0" }, "peerDependencies": { "highlight.js": "^10.0.3 || ^11" @@ -2033,6 +2071,20 @@ "node": ">=8" } }, + "node_modules/@diplodoc/utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@diplodoc/utils/-/utils-2.1.0.tgz", + "integrity": "sha512-1XfZSb0gPLqSRGwxlLHcXo4c59bcFomcEaDM5v2S/aFDhgNRfZgDGxWEbHwkIijfBB2rvFWuVgKzON0VDp2uqQ==", + "license": "MIT", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "react": { + "optional": true + } + } + }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.7", "dev": true, @@ -2181,6 +2233,7 @@ "os": [ "aix" ], + "peer": true, "engines": { "node": ">=18" } @@ -2198,6 +2251,7 @@ "os": [ "android" ], + "peer": true, "engines": { "node": ">=18" } @@ -2215,6 +2269,7 @@ "os": [ "android" ], + "peer": true, "engines": { "node": ">=18" } @@ -2232,6 +2287,7 @@ "os": [ "android" ], + "peer": true, "engines": { "node": ">=18" } @@ -2249,6 +2305,7 @@ "os": [ "darwin" ], + "peer": true, "engines": { "node": ">=18" } @@ -2266,6 +2323,7 @@ "os": [ "darwin" ], + "peer": true, "engines": { "node": ">=18" } @@ -2283,6 +2341,7 @@ "os": [ "freebsd" ], + "peer": true, "engines": { "node": ">=18" } @@ -2300,6 +2359,7 @@ "os": [ "freebsd" ], + "peer": true, "engines": { "node": ">=18" } @@ -2317,6 +2377,7 @@ "os": [ "linux" ], + "peer": true, "engines": { "node": ">=18" } @@ -2334,6 +2395,7 @@ "os": [ "linux" ], + "peer": true, "engines": { "node": ">=18" } @@ -2351,6 +2413,7 @@ "os": [ "linux" ], + "peer": true, "engines": { "node": ">=18" } @@ -2368,6 +2431,7 @@ "os": [ "linux" ], + "peer": true, "engines": { "node": ">=18" } @@ -2385,6 +2449,7 @@ "os": [ "linux" ], + "peer": true, "engines": { "node": ">=18" } @@ -2402,6 +2467,7 @@ "os": [ "linux" ], + "peer": true, "engines": { "node": ">=18" } @@ -2419,6 +2485,7 @@ "os": [ "linux" ], + "peer": true, "engines": { "node": ">=18" } @@ -2436,6 +2503,7 @@ "os": [ "linux" ], + "peer": true, "engines": { "node": ">=18" } @@ -2453,6 +2521,7 @@ "os": [ "linux" ], + "peer": true, "engines": { "node": ">=18" } @@ -2470,6 +2539,7 @@ "os": [ "netbsd" ], + "peer": true, "engines": { "node": ">=18" } @@ -2487,6 +2557,7 @@ "os": [ "netbsd" ], + "peer": true, "engines": { "node": ">=18" } @@ -2504,6 +2575,7 @@ "os": [ "openbsd" ], + "peer": true, "engines": { "node": ">=18" } @@ -2521,6 +2593,7 @@ "os": [ "openbsd" ], + "peer": true, "engines": { "node": ">=18" } @@ -2538,6 +2611,7 @@ "os": [ "openharmony" ], + "peer": true, "engines": { "node": ">=18" } @@ -2555,6 +2629,7 @@ "os": [ "sunos" ], + "peer": true, "engines": { "node": ">=18" } @@ -2572,6 +2647,7 @@ "os": [ "win32" ], + "peer": true, "engines": { "node": ">=18" } @@ -2589,6 +2665,7 @@ "os": [ "win32" ], + "peer": true, "engines": { "node": ">=18" } @@ -2606,6 +2683,7 @@ "os": [ "win32" ], + "peer": true, "engines": { "node": ">=18" } @@ -3027,6 +3105,316 @@ "node": ">= 8" } }, + "node_modules/@parcel/watcher": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz", + "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "dependencies": { + "detect-libc": "^1.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.5.1", + "@parcel/watcher-darwin-arm64": "2.5.1", + "@parcel/watcher-darwin-x64": "2.5.1", + "@parcel/watcher-freebsd-x64": "2.5.1", + "@parcel/watcher-linux-arm-glibc": "2.5.1", + "@parcel/watcher-linux-arm-musl": "2.5.1", + "@parcel/watcher-linux-arm64-glibc": "2.5.1", + "@parcel/watcher-linux-arm64-musl": "2.5.1", + "@parcel/watcher-linux-x64-glibc": "2.5.1", + "@parcel/watcher-linux-x64-musl": "2.5.1", + "@parcel/watcher-win32-arm64": "2.5.1", + "@parcel/watcher-win32-ia32": "2.5.1", + "@parcel/watcher-win32-x64": "2.5.1" + } + }, + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz", + "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz", + "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz", + "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz", + "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz", + "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz", + "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz", + "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz", + "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz", + "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz", + "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz", + "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-ia32": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz", + "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz", + "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "dev": true, @@ -4545,6 +4933,7 @@ "integrity": "sha512-Ok18Y698Ccyg++MoUNJNHY0cXUvo8ETFIRLJk1g9ElJ70j6kPgNnzW2pAtZkBNmswHtofZ7pT156cj96k/LgfA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@storybook/manager-api": "7.6.17", "@storybook/preview-api": "7.6.17", @@ -4561,6 +4950,7 @@ "integrity": "sha512-GFG40pzaSxk1hUr/J/TMqW5AFDDPUSu+HkeE/oqSWJbOodBOLJzHN6CReJS6y1DjYSZLNFt1jftPWZZInG/XUA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@storybook/client-logger": "7.6.17", "@storybook/core-events": "7.6.17", @@ -4580,6 +4970,7 @@ "integrity": "sha512-6WBYqixAXNAXlSaBWwgljWpAu10tPRBJrcFvx2gPUne58EeMM20Gi/iHYBz2kMCY+JLAgeIH7ZxInqwO8vDwiQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@storybook/global": "^5.0.0" }, @@ -4594,6 +4985,7 @@ "integrity": "sha512-AriWMCm/k1cxlv10f+jZ1wavThTRpLaN3kY019kHWbYT9XgaSuLU67G7GPr3cGnJ6HuA6uhbzu8qtqVCd6OfXA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "ts-dedent": "^2.0.0" }, @@ -4608,6 +5000,7 @@ "integrity": "sha512-IJIV1Yc6yw1dhCY4tReHCfBnUKDqEBnMyHp3mbXpsaHxnxJZrXO45WjRAZIKlQKhl/Ge1CrnznmHRCmYgqmrWg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@storybook/channels": "7.6.17", "@storybook/client-logger": "7.6.17", @@ -4635,6 +5028,7 @@ "integrity": "sha512-wLfDdI9RWo1f2zzFe54yRhg+2YWyxLZvqdZnSQ45mTs4/7xXV5Wfbv3QNTtcdw8tT3U5KRTrN1mTfTCiRJc0Kw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@storybook/channels": "7.6.17", "@storybook/client-logger": "7.6.17", @@ -4662,6 +5056,7 @@ "integrity": "sha512-GnyC0j6Wi5hT4qRhSyT8NPtJfGmf82uZw97LQRWeyYu5gWEshUdM7aj40XlNiScd5cZDp0owO1idduVF2k2l2A==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@storybook/client-logger": "7.6.17", "memoizerific": "^1.11.3", @@ -4678,6 +5073,7 @@ "integrity": "sha512-ZbaBt3KAbmBtfjNqgMY7wPMBshhSJlhodyMNQypv+95xLD/R+Az6aBYbpVAOygLaUQaQk4ar7H/Ww6lFIoiFbA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", "@storybook/client-logger": "7.6.17", @@ -4699,6 +5095,7 @@ "integrity": "sha512-GRY0xEJQ0PrL7DY2qCNUdIfUOE0Gsue6N+GBJw9ku1IUDFLJRDOF+4Dx2BvYcVCPI5XPqdWKlEyZdMdKjiQN7Q==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@storybook/channels": "7.6.17", "@types/babel__core": "^7.0.0", @@ -4714,7 +5111,6 @@ "version": "7.6.17", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@storybook/client-logger": "7.6.17", "@storybook/manager-api": "7.6.17" @@ -5573,7 +5969,6 @@ "version": "7.6.20", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@radix-ui/react-select": "^1.2.2", "@radix-ui/react-toolbar": "^1.0.4", @@ -6119,7 +6514,6 @@ "version": "7.6.20", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "ts-dedent": "^2.0.0" }, @@ -6737,7 +7131,6 @@ "version": "7.6.20", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", "@storybook/client-logger": "7.6.20", @@ -6917,7 +7310,6 @@ "version": "8.1.0", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/core": "^7.21.3", "@svgr/babel-preset": "8.1.0", @@ -7017,7 +7409,6 @@ "dev": true, "hasInstallScript": true, "license": "Apache-2.0", - "peer": true, "dependencies": { "@swc/counter": "^0.1.3", "@swc/types": "^0.1.12" @@ -7502,11 +7893,36 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/linkify-it": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz", + "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==", + "license": "MIT", + "peer": true + }, "node_modules/@types/lodash": { "version": "4.17.7", "dev": true, "license": "MIT" }, + "node_modules/@types/markdown-it": { + "version": "13.0.9", + "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-13.0.9.tgz", + "integrity": "sha512-1XPwR0+MgXLWfTn9gCsZ55AHOKW1WN+P9vr0PaQh5aerR9LLQXUbjfEAFhjmEmyoYFWAyuN2Mqkn40MZ4ukjBw==", + "license": "MIT", + "peer": true, + "dependencies": { + "@types/linkify-it": "^3", + "@types/mdurl": "^1" + } + }, + "node_modules/@types/mdurl": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz", + "integrity": "sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==", + "license": "MIT", + "peer": true + }, "node_modules/@types/mdx": { "version": "2.0.13", "dev": true, @@ -7843,7 +8259,6 @@ "version": "7.4.1", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -7911,7 +8326,6 @@ "version": "8.17.1", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -8557,7 +8971,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001646", "electron-to-chromium": "^1.5.4", @@ -9151,6 +9564,7 @@ "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "is-what": "^3.14.1" }, @@ -9591,6 +10005,20 @@ "node": ">=8" } }, + "node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/detect-node-es": { "version": "1.1.0", "dev": true, @@ -9908,6 +10336,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "dependencies": { "prr": "~1.0.1" }, @@ -10105,6 +10534,7 @@ }, "node_modules/esprima": { "version": "4.0.1", + "dev": true, "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", @@ -10619,7 +11049,6 @@ "version": "6.12.6", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -11398,6 +11827,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "bin": { "image-size": "bin/image-size.js" }, @@ -11892,7 +12322,8 @@ "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/is-wsl": { "version": "2.2.0", @@ -12449,6 +12880,7 @@ "integrity": "sha512-j1n1IuTX1VQjIy3tT7cyGbX7nvQOsFLoIqobZv4ttI5axP923gA44zUj6miiA6R5Aoms4sEGVIIcucXUbRI14g==", "dev": true, "license": "Apache-2.0", + "peer": true, "dependencies": { "copy-anything": "^2.0.1", "parse-node-version": "^1.0.1", @@ -12493,6 +12925,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "dependencies": { "pify": "^4.0.1", "semver": "^5.6.0" @@ -12508,6 +12941,7 @@ "dev": true, "license": "ISC", "optional": true, + "peer": true, "bin": { "semver": "bin/semver" } @@ -12519,6 +12953,7 @@ "dev": true, "license": "BSD-3-Clause", "optional": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -12722,7 +13157,6 @@ "node_modules/markdown-it": { "version": "13.0.2", "license": "MIT", - "peer": true, "dependencies": { "argparse": "^2.0.1", "entities": "~3.0.1", @@ -12735,7 +13169,9 @@ } }, "node_modules/markdown-it-attrs": { - "version": "4.1.4", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/markdown-it-attrs/-/markdown-it-attrs-4.3.1.tgz", + "integrity": "sha512-/ko6cba+H6gdZ0DOw7BbNMZtfuJTRp9g/IrGIuz8lYc/EfnmWRpaR3CFPnNbVz0LDvF8Gf1hFGPqrQqq7De0rg==", "license": "MIT", "engines": { "node": ">=6" @@ -12748,29 +13184,14 @@ "version": "2.1.0", "license": "MIT" }, - "node_modules/markdown-it-meta": { - "version": "0.0.1", - "license": "MIT", - "dependencies": { - "js-yaml": "^3.8.1" - } - }, - "node_modules/markdown-it-meta/node_modules/argparse": { - "version": "1.0.10", - "license": "MIT", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/markdown-it-meta/node_modules/js-yaml": { - "version": "3.14.1", + "node_modules/markdown-it-directive": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/markdown-it-directive/-/markdown-it-directive-2.0.6.tgz", + "integrity": "sha512-yTjIan0I3LRMooa9uPNTs1DlcNVx/NqRjrEd3eipe286I8t3z+xzSSstrQ3OGDmKJkDSjg0rShO1t3uMN04U3Q==", "license": "MIT", - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" + "peerDependencies": { + "@types/markdown-it": "^12.0.0 || ^13.0.0", + "markdown-it": "^12.0.0 || ^13.0.0" } }, "node_modules/markdown-it-sup": { @@ -13094,6 +13515,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "dependencies": { "iconv-lite": "^0.6.3", "sax": "^1.2.4" @@ -13132,6 +13554,14 @@ "dev": true, "license": "MIT" }, + "node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "dev": true, + "license": "MIT", + "optional": true + }, "node_modules/node-dir": { "version": "0.1.17", "dev": true, @@ -13677,6 +14107,7 @@ "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">= 0.10" } @@ -13908,7 +14339,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.0.1", @@ -14146,7 +14576,8 @@ "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", "dev": true, "license": "MIT", - "optional": true + "optional": true, + "peer": true }, "node_modules/pump": { "version": "3.0.0", @@ -14283,6 +14714,18 @@ ], "license": "MIT" }, + "node_modules/quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/ramda": { "version": "0.29.0", "dev": true, @@ -14336,7 +14779,6 @@ "node_modules/react": { "version": "18.3.1", "license": "MIT", - "peer": true, "dependencies": { "loose-envify": "^1.1.0" }, @@ -14403,7 +14845,6 @@ "node_modules/react-dom": { "version": "18.3.1", "license": "MIT", - "peer": true, "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.2" @@ -14445,7 +14886,6 @@ "version": "0.14.2", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -15124,12 +15564,13 @@ } }, "node_modules/sass": { - "version": "1.77.8", + "version": "1.80.6", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz", + "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", + "chokidar": "^4.0.0", "immutable": "^4.0.0", "source-map-js": ">=0.6.2 <2.0.0" }, @@ -15138,6 +15579,9 @@ }, "engines": { "node": ">=14.0.0" + }, + "optionalDependencies": { + "@parcel/watcher": "^2.4.1" } }, "node_modules/sass-loader": { @@ -15176,13 +15620,44 @@ } } }, + "node_modules/sass/node_modules/chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/sass/node_modules/readdirp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/sax": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.3.tgz", "integrity": "sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==", "dev": true, "license": "BlueOak-1.0.0", - "optional": true + "optional": true, + "peer": true }, "node_modules/scheduler": { "version": "0.23.2", @@ -15381,7 +15856,9 @@ } }, "node_modules/slugify": { - "version": "1.6.5", + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz", + "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==", "license": "MIT", "engines": { "node": ">=8.0.0" @@ -15475,6 +15952,7 @@ }, "node_modules/sprintf-js": { "version": "1.0.3", + "dev": true, "license": "BSD-3-Clause" }, "node_modules/stackframe": { @@ -15964,7 +16442,6 @@ "version": "6.12.6", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -16184,7 +16661,6 @@ }, "node_modules/ts-dedent": { "version": "2.2.0", - "dev": true, "license": "MIT", "engines": { "node": ">=6.10" @@ -16204,7 +16680,6 @@ "version": "2.19.0", "dev": true, "license": "(MIT OR CC0-1.0)", - "peer": true, "engines": { "node": ">=12.20" }, @@ -16633,7 +17108,6 @@ "version": "5.93.0", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^1.0.5", @@ -16746,7 +17220,6 @@ "version": "8.12.1", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -16766,7 +17239,6 @@ "version": "6.12.6", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", diff --git a/demo/package.json b/demo/package.json index f7a9be17..afc2f34e 100644 --- a/demo/package.json +++ b/demo/package.json @@ -22,11 +22,11 @@ "@storybook/react-webpack5": "^7.6.17", "@storybook/testing-library": "^0.2.0", "@svgr/webpack": "^8.1.0", - "sass": "^1.66.1", + "sass": "^1.80.6", "storybook": "^7.6.17" }, "dependencies": { - "@diplodoc/transform": "^4.26.0", + "@diplodoc/transform": "^4.64.0", "bem-cn-lite": "^4.1.0", "prop-types": "^15.8.1", "react": "^18.2.0", diff --git a/demo/src/Components/ConsentPopup/index.scss b/demo/src/Components/ConsentPopup/index.scss index d6e03bb8..3eed861b 100644 --- a/demo/src/Components/ConsentPopup/index.scss +++ b/demo/src/Components/ConsentPopup/index.scss @@ -1,2 +1 @@ -@import '@diplodoc/components'; -@import '@diplodoc/components/themes/common'; +@import '@diplodoc/components/build/index.css'; diff --git a/demo/src/Components/DocPage/index.scss b/demo/src/Components/DocPage/index.scss index 51d8dcca..f49bb2dc 100644 --- a/demo/src/Components/DocPage/index.scss +++ b/demo/src/Components/DocPage/index.scss @@ -1,3 +1,2 @@ -@import '@diplodoc/transform/dist/css/yfm.css'; -@import '@diplodoc/components'; -@import '@diplodoc/components/themes/common'; +@import '@diplodoc/components/build/index.css'; +@import '@diplodoc/transform/dist/scss/yfm-base.scss'; diff --git a/demo/src/Components/DocPageHidden/index.scss b/demo/src/Components/DocPageHidden/index.scss index 51d8dcca..f49bb2dc 100644 --- a/demo/src/Components/DocPageHidden/index.scss +++ b/demo/src/Components/DocPageHidden/index.scss @@ -1,3 +1,2 @@ -@import '@diplodoc/transform/dist/css/yfm.css'; -@import '@diplodoc/components'; -@import '@diplodoc/components/themes/common'; +@import '@diplodoc/components/build/index.css'; +@import '@diplodoc/transform/dist/scss/yfm-base.scss'; diff --git a/demo/src/Components/SearchSuggest/index.scss b/demo/src/Components/SearchSuggest/index.scss index 38ca19b4..2eb72ab4 100644 --- a/demo/src/Components/SearchSuggest/index.scss +++ b/demo/src/Components/SearchSuggest/index.scss @@ -1,4 +1,4 @@ -@import '@diplodoc/components'; +@import '@diplodoc/components/build/index.css'; .header { display: flex; diff --git a/package-lock.json b/package-lock.json index ac5765f5..f2cb7f08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { + "@diplodoc/themes": "^1.2.0", "@gravity-ui/components": "^4.16.0", "@gravity-ui/icons": "^2.5.0", "@gravity-ui/page-constructor": "^7.21.0", @@ -1620,6 +1621,12 @@ } } }, + "node_modules/@diplodoc/themes": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@diplodoc/themes/-/themes-1.2.0.tgz", + "integrity": "sha512-fb1iPz9TN0PjLXaKT4fudJxoBPdyR6AxYG9yp40a+A833vGtIKXBLrrKhNWk/eGdAheTgROtGk5N6o2vYnnltg==", + "license": "MIT" + }, "node_modules/@diplodoc/transform": { "version": "4.65.0", "resolved": "https://registry.npmjs.org/@diplodoc/transform/-/transform-4.65.0.tgz", diff --git a/package.json b/package.json index 7796a567..8b9bde06 100644 --- a/package.json +++ b/package.json @@ -75,6 +75,7 @@ "prepare": "husky || true" }, "dependencies": { + "@diplodoc/themes": "^1.2.0", "@gravity-ui/components": "^4.16.0", "@gravity-ui/icons": "^2.5.0", "@gravity-ui/page-constructor": "^7.21.0", diff --git a/src/components/ContributorAvatars/__screenshots__/Avatar-popup-chromium-linux.png b/src/components/ContributorAvatars/__screenshots__/Avatar-popup-chromium-linux.png index 1f3fe875..1ed781fc 100644 Binary files a/src/components/ContributorAvatars/__screenshots__/Avatar-popup-chromium-linux.png and b/src/components/ContributorAvatars/__screenshots__/Avatar-popup-chromium-linux.png differ diff --git a/src/components/ContributorAvatars/__screenshots__/Avatar-popup-firefox-linux.png b/src/components/ContributorAvatars/__screenshots__/Avatar-popup-firefox-linux.png index bdb1f4d5..c417df13 100644 Binary files a/src/components/ContributorAvatars/__screenshots__/Avatar-popup-firefox-linux.png and b/src/components/ContributorAvatars/__screenshots__/Avatar-popup-firefox-linux.png differ diff --git a/src/components/ContributorAvatars/__screenshots__/Avatar-popup-webkit-linux.png b/src/components/ContributorAvatars/__screenshots__/Avatar-popup-webkit-linux.png index 46b6bb66..66e61ee3 100644 Binary files a/src/components/ContributorAvatars/__screenshots__/Avatar-popup-webkit-linux.png and b/src/components/ContributorAvatars/__screenshots__/Avatar-popup-webkit-linux.png differ diff --git a/src/components/ContributorAvatars/__screenshots__/ContributorAvatars-chromium-linux.png b/src/components/ContributorAvatars/__screenshots__/ContributorAvatars-chromium-linux.png index e3de5e59..032f4c15 100644 Binary files a/src/components/ContributorAvatars/__screenshots__/ContributorAvatars-chromium-linux.png and b/src/components/ContributorAvatars/__screenshots__/ContributorAvatars-chromium-linux.png differ diff --git a/src/components/ContributorAvatars/__screenshots__/ContributorAvatars-firefox-linux.png b/src/components/ContributorAvatars/__screenshots__/ContributorAvatars-firefox-linux.png index 87ef6e83..397c93ab 100644 Binary files a/src/components/ContributorAvatars/__screenshots__/ContributorAvatars-firefox-linux.png and b/src/components/ContributorAvatars/__screenshots__/ContributorAvatars-firefox-linux.png differ diff --git a/src/components/ContributorAvatars/__screenshots__/ContributorAvatars-webkit-linux.png b/src/components/ContributorAvatars/__screenshots__/ContributorAvatars-webkit-linux.png index 1e1f8408..b29029ed 100644 Binary files a/src/components/ContributorAvatars/__screenshots__/ContributorAvatars-webkit-linux.png and b/src/components/ContributorAvatars/__screenshots__/ContributorAvatars-webkit-linux.png differ diff --git a/src/components/ContributorAvatars/__screenshots__/HiddenAvatars-popup-chromium-linux.png b/src/components/ContributorAvatars/__screenshots__/HiddenAvatars-popup-chromium-linux.png index 9d9b9f0d..ea21d4a3 100644 Binary files a/src/components/ContributorAvatars/__screenshots__/HiddenAvatars-popup-chromium-linux.png and b/src/components/ContributorAvatars/__screenshots__/HiddenAvatars-popup-chromium-linux.png differ diff --git a/src/components/ContributorAvatars/__screenshots__/HiddenAvatars-popup-firefox-linux.png b/src/components/ContributorAvatars/__screenshots__/HiddenAvatars-popup-firefox-linux.png index 5319231a..ffea42c8 100644 Binary files a/src/components/ContributorAvatars/__screenshots__/HiddenAvatars-popup-firefox-linux.png and b/src/components/ContributorAvatars/__screenshots__/HiddenAvatars-popup-firefox-linux.png differ diff --git a/src/components/ContributorAvatars/__screenshots__/HiddenAvatars-popup-webkit-linux.png b/src/components/ContributorAvatars/__screenshots__/HiddenAvatars-popup-webkit-linux.png index 851157e8..c19f50fc 100644 Binary files a/src/components/ContributorAvatars/__screenshots__/HiddenAvatars-popup-webkit-linux.png and b/src/components/ContributorAvatars/__screenshots__/HiddenAvatars-popup-webkit-linux.png differ diff --git a/src/components/Control/__screenshots__/Control-chromium-linux.png b/src/components/Control/__screenshots__/Control-chromium-linux.png index a48ef452..820743d2 100644 Binary files a/src/components/Control/__screenshots__/Control-chromium-linux.png and b/src/components/Control/__screenshots__/Control-chromium-linux.png differ diff --git a/src/components/Control/__screenshots__/Control-firefox-linux.png b/src/components/Control/__screenshots__/Control-firefox-linux.png index 4026f8cc..45c7161d 100644 Binary files a/src/components/Control/__screenshots__/Control-firefox-linux.png and b/src/components/Control/__screenshots__/Control-firefox-linux.png differ diff --git a/src/components/Control/__screenshots__/Control-webkit-linux.png b/src/components/Control/__screenshots__/Control-webkit-linux.png index 50904136..13f57ae0 100644 Binary files a/src/components/Control/__screenshots__/Control-webkit-linux.png and b/src/components/Control/__screenshots__/Control-webkit-linux.png differ diff --git a/src/components/Controls/__screenshots__/LangControl-default-chromium-linux.png b/src/components/Controls/__screenshots__/LangControl-default-chromium-linux.png index 8311cb43..358fb880 100644 Binary files a/src/components/Controls/__screenshots__/LangControl-default-chromium-linux.png and b/src/components/Controls/__screenshots__/LangControl-default-chromium-linux.png differ diff --git a/src/components/Controls/__screenshots__/LangControl-default-firefox-linux.png b/src/components/Controls/__screenshots__/LangControl-default-firefox-linux.png index 37c67fc4..9f596e00 100644 Binary files a/src/components/Controls/__screenshots__/LangControl-default-firefox-linux.png and b/src/components/Controls/__screenshots__/LangControl-default-firefox-linux.png differ diff --git a/src/components/Controls/__screenshots__/LangControl-default-webkit-linux.png b/src/components/Controls/__screenshots__/LangControl-default-webkit-linux.png index e4e9421f..ba066335 100644 Binary files a/src/components/Controls/__screenshots__/LangControl-default-webkit-linux.png and b/src/components/Controls/__screenshots__/LangControl-default-webkit-linux.png differ diff --git a/src/components/Controls/__screenshots__/SettingsControl-clicked-chromium-linux.png b/src/components/Controls/__screenshots__/SettingsControl-clicked-chromium-linux.png index 663b14a0..f023fd5e 100644 Binary files a/src/components/Controls/__screenshots__/SettingsControl-clicked-chromium-linux.png and b/src/components/Controls/__screenshots__/SettingsControl-clicked-chromium-linux.png differ diff --git a/src/components/Controls/__screenshots__/SettingsControl-clicked-firefox-linux.png b/src/components/Controls/__screenshots__/SettingsControl-clicked-firefox-linux.png index daa111ae..6907ec8e 100644 Binary files a/src/components/Controls/__screenshots__/SettingsControl-clicked-firefox-linux.png and b/src/components/Controls/__screenshots__/SettingsControl-clicked-firefox-linux.png differ diff --git a/src/components/Controls/__screenshots__/SettingsControl-clicked-webkit-linux.png b/src/components/Controls/__screenshots__/SettingsControl-clicked-webkit-linux.png index 8e6d8009..d50426d5 100644 Binary files a/src/components/Controls/__screenshots__/SettingsControl-clicked-webkit-linux.png and b/src/components/Controls/__screenshots__/SettingsControl-clicked-webkit-linux.png differ diff --git a/src/components/Controls/__screenshots__/SettingsControl-default-chromium-linux.png b/src/components/Controls/__screenshots__/SettingsControl-default-chromium-linux.png index 05087264..d16be7f1 100644 Binary files a/src/components/Controls/__screenshots__/SettingsControl-default-chromium-linux.png and b/src/components/Controls/__screenshots__/SettingsControl-default-chromium-linux.png differ diff --git a/src/components/Controls/__screenshots__/SettingsControl-default-firefox-linux.png b/src/components/Controls/__screenshots__/SettingsControl-default-firefox-linux.png index f2e55176..9ad336fe 100644 Binary files a/src/components/Controls/__screenshots__/SettingsControl-default-firefox-linux.png and b/src/components/Controls/__screenshots__/SettingsControl-default-firefox-linux.png differ diff --git a/src/components/Controls/__screenshots__/SettingsControl-default-webkit-linux.png b/src/components/Controls/__screenshots__/SettingsControl-default-webkit-linux.png index 9294f264..edb13dcc 100644 Binary files a/src/components/Controls/__screenshots__/SettingsControl-default-webkit-linux.png and b/src/components/Controls/__screenshots__/SettingsControl-default-webkit-linux.png differ diff --git a/src/components/DocPage/__screenshots__/DocPage-chromium-linux.png b/src/components/DocPage/__screenshots__/DocPage-chromium-linux.png index a7da991a..ccede24b 100644 Binary files a/src/components/DocPage/__screenshots__/DocPage-chromium-linux.png and b/src/components/DocPage/__screenshots__/DocPage-chromium-linux.png differ diff --git a/src/components/DocPage/__screenshots__/DocPage-firefox-linux.png b/src/components/DocPage/__screenshots__/DocPage-firefox-linux.png index f7a0ca61..571986f5 100644 Binary files a/src/components/DocPage/__screenshots__/DocPage-firefox-linux.png and b/src/components/DocPage/__screenshots__/DocPage-firefox-linux.png differ diff --git a/src/components/DocPage/__screenshots__/DocPage-webkit-linux.png b/src/components/DocPage/__screenshots__/DocPage-webkit-linux.png index 3f2ded5b..76d0ebf4 100644 Binary files a/src/components/DocPage/__screenshots__/DocPage-webkit-linux.png and b/src/components/DocPage/__screenshots__/DocPage-webkit-linux.png differ diff --git a/src/components/Feedback/__screenshots__/DislikeVariantsPopup-desktop-popup-chromium-linux.png b/src/components/Feedback/__screenshots__/DislikeVariantsPopup-desktop-popup-chromium-linux.png index 3403e4f0..22f3112f 100644 Binary files a/src/components/Feedback/__screenshots__/DislikeVariantsPopup-desktop-popup-chromium-linux.png and b/src/components/Feedback/__screenshots__/DislikeVariantsPopup-desktop-popup-chromium-linux.png differ diff --git a/src/components/Feedback/__screenshots__/DislikeVariantsPopup-desktop-popup-firefox-linux.png b/src/components/Feedback/__screenshots__/DislikeVariantsPopup-desktop-popup-firefox-linux.png index ff16f6b8..30cd13c7 100644 Binary files a/src/components/Feedback/__screenshots__/DislikeVariantsPopup-desktop-popup-firefox-linux.png and b/src/components/Feedback/__screenshots__/DislikeVariantsPopup-desktop-popup-firefox-linux.png differ diff --git a/src/components/Feedback/__screenshots__/DislikeVariantsPopup-desktop-popup-webkit-linux.png b/src/components/Feedback/__screenshots__/DislikeVariantsPopup-desktop-popup-webkit-linux.png index 22911201..b48eecc9 100644 Binary files a/src/components/Feedback/__screenshots__/DislikeVariantsPopup-desktop-popup-webkit-linux.png and b/src/components/Feedback/__screenshots__/DislikeVariantsPopup-desktop-popup-webkit-linux.png differ diff --git a/src/components/Feedback/__screenshots__/DislikeVariantsPopup-mobile-popup-chromium-linux.png b/src/components/Feedback/__screenshots__/DislikeVariantsPopup-mobile-popup-chromium-linux.png index b2415deb..1e32e9e0 100644 Binary files a/src/components/Feedback/__screenshots__/DislikeVariantsPopup-mobile-popup-chromium-linux.png and b/src/components/Feedback/__screenshots__/DislikeVariantsPopup-mobile-popup-chromium-linux.png differ diff --git a/src/components/Feedback/__screenshots__/DislikeVariantsPopup-mobile-popup-firefox-linux.png b/src/components/Feedback/__screenshots__/DislikeVariantsPopup-mobile-popup-firefox-linux.png index b2793e7c..f271c2c5 100644 Binary files a/src/components/Feedback/__screenshots__/DislikeVariantsPopup-mobile-popup-firefox-linux.png and b/src/components/Feedback/__screenshots__/DislikeVariantsPopup-mobile-popup-firefox-linux.png differ diff --git a/src/components/Feedback/__screenshots__/DislikeVariantsPopup-mobile-popup-webkit-linux.png b/src/components/Feedback/__screenshots__/DislikeVariantsPopup-mobile-popup-webkit-linux.png index aa86e470..63b0b2b8 100644 Binary files a/src/components/Feedback/__screenshots__/DislikeVariantsPopup-mobile-popup-webkit-linux.png and b/src/components/Feedback/__screenshots__/DislikeVariantsPopup-mobile-popup-webkit-linux.png differ diff --git a/src/components/Feedback/__screenshots__/FeedbackControls-desktop-scrolled-chromium-linux.png b/src/components/Feedback/__screenshots__/FeedbackControls-desktop-scrolled-chromium-linux.png index ac0a51e3..287bcd13 100644 Binary files a/src/components/Feedback/__screenshots__/FeedbackControls-desktop-scrolled-chromium-linux.png and b/src/components/Feedback/__screenshots__/FeedbackControls-desktop-scrolled-chromium-linux.png differ diff --git a/src/components/Feedback/__screenshots__/FeedbackControls-desktop-scrolled-firefox-linux.png b/src/components/Feedback/__screenshots__/FeedbackControls-desktop-scrolled-firefox-linux.png index cd005cee..bc4e505f 100644 Binary files a/src/components/Feedback/__screenshots__/FeedbackControls-desktop-scrolled-firefox-linux.png and b/src/components/Feedback/__screenshots__/FeedbackControls-desktop-scrolled-firefox-linux.png differ diff --git a/src/components/Feedback/__screenshots__/FeedbackControls-desktop-scrolled-webkit-linux.png b/src/components/Feedback/__screenshots__/FeedbackControls-desktop-scrolled-webkit-linux.png index e94f1ba2..c5c85ae7 100644 Binary files a/src/components/Feedback/__screenshots__/FeedbackControls-desktop-scrolled-webkit-linux.png and b/src/components/Feedback/__screenshots__/FeedbackControls-desktop-scrolled-webkit-linux.png differ diff --git a/src/components/Feedback/__screenshots__/FeedbackControls-mobile-scrolled-chromium-linux.png b/src/components/Feedback/__screenshots__/FeedbackControls-mobile-scrolled-chromium-linux.png index 37d9ac36..06dfe117 100644 Binary files a/src/components/Feedback/__screenshots__/FeedbackControls-mobile-scrolled-chromium-linux.png and b/src/components/Feedback/__screenshots__/FeedbackControls-mobile-scrolled-chromium-linux.png differ diff --git a/src/components/Feedback/__screenshots__/FeedbackControls-mobile-scrolled-firefox-linux.png b/src/components/Feedback/__screenshots__/FeedbackControls-mobile-scrolled-firefox-linux.png index d598c9fe..ab97866d 100644 Binary files a/src/components/Feedback/__screenshots__/FeedbackControls-mobile-scrolled-firefox-linux.png and b/src/components/Feedback/__screenshots__/FeedbackControls-mobile-scrolled-firefox-linux.png differ diff --git a/src/components/Feedback/__screenshots__/FeedbackControls-mobile-scrolled-webkit-linux.png b/src/components/Feedback/__screenshots__/FeedbackControls-mobile-scrolled-webkit-linux.png index 242a34cd..e8557d2b 100644 Binary files a/src/components/Feedback/__screenshots__/FeedbackControls-mobile-scrolled-webkit-linux.png and b/src/components/Feedback/__screenshots__/FeedbackControls-mobile-scrolled-webkit-linux.png differ diff --git a/src/components/Feedback/__screenshots__/SuccessPopup-desktop-popup-chromium-linux.png b/src/components/Feedback/__screenshots__/SuccessPopup-desktop-popup-chromium-linux.png index f6db7ff5..79b9ccc5 100644 Binary files a/src/components/Feedback/__screenshots__/SuccessPopup-desktop-popup-chromium-linux.png and b/src/components/Feedback/__screenshots__/SuccessPopup-desktop-popup-chromium-linux.png differ diff --git a/src/components/Feedback/__screenshots__/SuccessPopup-desktop-popup-firefox-linux.png b/src/components/Feedback/__screenshots__/SuccessPopup-desktop-popup-firefox-linux.png index c4cfbc81..142b3e2e 100644 Binary files a/src/components/Feedback/__screenshots__/SuccessPopup-desktop-popup-firefox-linux.png and b/src/components/Feedback/__screenshots__/SuccessPopup-desktop-popup-firefox-linux.png differ diff --git a/src/components/Feedback/__screenshots__/SuccessPopup-desktop-popup-webkit-linux.png b/src/components/Feedback/__screenshots__/SuccessPopup-desktop-popup-webkit-linux.png index a4342bc3..ffa5d84d 100644 Binary files a/src/components/Feedback/__screenshots__/SuccessPopup-desktop-popup-webkit-linux.png and b/src/components/Feedback/__screenshots__/SuccessPopup-desktop-popup-webkit-linux.png differ diff --git a/src/components/Feedback/__screenshots__/SuccessPopup-mobile-popup-chromium-linux.png b/src/components/Feedback/__screenshots__/SuccessPopup-mobile-popup-chromium-linux.png index 13b2c7d6..8d586deb 100644 Binary files a/src/components/Feedback/__screenshots__/SuccessPopup-mobile-popup-chromium-linux.png and b/src/components/Feedback/__screenshots__/SuccessPopup-mobile-popup-chromium-linux.png differ diff --git a/src/components/Feedback/__screenshots__/SuccessPopup-mobile-popup-firefox-linux.png b/src/components/Feedback/__screenshots__/SuccessPopup-mobile-popup-firefox-linux.png index 9dac94c2..295b7195 100644 Binary files a/src/components/Feedback/__screenshots__/SuccessPopup-mobile-popup-firefox-linux.png and b/src/components/Feedback/__screenshots__/SuccessPopup-mobile-popup-firefox-linux.png differ diff --git a/src/components/Feedback/__screenshots__/SuccessPopup-mobile-popup-webkit-linux.png b/src/components/Feedback/__screenshots__/SuccessPopup-mobile-popup-webkit-linux.png index 1e4469a0..38a88666 100644 Binary files a/src/components/Feedback/__screenshots__/SuccessPopup-mobile-popup-webkit-linux.png and b/src/components/Feedback/__screenshots__/SuccessPopup-mobile-popup-webkit-linux.png differ diff --git a/src/components/MiniToc/__screenshots__/MiniToc-navigation-chromium-linux.png b/src/components/MiniToc/__screenshots__/MiniToc-navigation-chromium-linux.png index 4f5c53cd..868b4513 100644 Binary files a/src/components/MiniToc/__screenshots__/MiniToc-navigation-chromium-linux.png and b/src/components/MiniToc/__screenshots__/MiniToc-navigation-chromium-linux.png differ diff --git a/src/components/MiniToc/__screenshots__/MiniToc-navigation-firefox-linux.png b/src/components/MiniToc/__screenshots__/MiniToc-navigation-firefox-linux.png index ca6fd949..40591bef 100644 Binary files a/src/components/MiniToc/__screenshots__/MiniToc-navigation-firefox-linux.png and b/src/components/MiniToc/__screenshots__/MiniToc-navigation-firefox-linux.png differ diff --git a/src/components/MiniToc/__screenshots__/MiniToc-navigation-webkit-linux.png b/src/components/MiniToc/__screenshots__/MiniToc-navigation-webkit-linux.png index d70c01fa..ed07f959 100644 Binary files a/src/components/MiniToc/__screenshots__/MiniToc-navigation-webkit-linux.png and b/src/components/MiniToc/__screenshots__/MiniToc-navigation-webkit-linux.png differ diff --git a/src/components/Subscribe/__screenshots__/Subscribe-success-popup-chromium-linux.png b/src/components/Subscribe/__screenshots__/Subscribe-success-popup-chromium-linux.png index 662a2557..f3fcc4ee 100644 Binary files a/src/components/Subscribe/__screenshots__/Subscribe-success-popup-chromium-linux.png and b/src/components/Subscribe/__screenshots__/Subscribe-success-popup-chromium-linux.png differ diff --git a/src/components/Subscribe/__screenshots__/Subscribe-success-popup-firefox-linux.png b/src/components/Subscribe/__screenshots__/Subscribe-success-popup-firefox-linux.png index 2129e981..0ef63688 100644 Binary files a/src/components/Subscribe/__screenshots__/Subscribe-success-popup-firefox-linux.png and b/src/components/Subscribe/__screenshots__/Subscribe-success-popup-firefox-linux.png differ diff --git a/src/components/Subscribe/__screenshots__/Subscribe-success-popup-webkit-linux.png b/src/components/Subscribe/__screenshots__/Subscribe-success-popup-webkit-linux.png index 79f1e544..3a373a85 100644 Binary files a/src/components/Subscribe/__screenshots__/Subscribe-success-popup-webkit-linux.png and b/src/components/Subscribe/__screenshots__/Subscribe-success-popup-webkit-linux.png differ diff --git a/src/components/Subscribe/__screenshots__/Subscribe-variants-popup-chromium-linux.png b/src/components/Subscribe/__screenshots__/Subscribe-variants-popup-chromium-linux.png index 92bde0dc..82e64674 100644 Binary files a/src/components/Subscribe/__screenshots__/Subscribe-variants-popup-chromium-linux.png and b/src/components/Subscribe/__screenshots__/Subscribe-variants-popup-chromium-linux.png differ diff --git a/src/components/Subscribe/__screenshots__/Subscribe-variants-popup-firefox-linux.png b/src/components/Subscribe/__screenshots__/Subscribe-variants-popup-firefox-linux.png index 9f1d2577..ab575420 100644 Binary files a/src/components/Subscribe/__screenshots__/Subscribe-variants-popup-firefox-linux.png and b/src/components/Subscribe/__screenshots__/Subscribe-variants-popup-firefox-linux.png differ diff --git a/src/components/Subscribe/__screenshots__/Subscribe-variants-popup-webkit-linux.png b/src/components/Subscribe/__screenshots__/Subscribe-variants-popup-webkit-linux.png index ab3397d5..5a045c36 100644 Binary files a/src/components/Subscribe/__screenshots__/Subscribe-variants-popup-webkit-linux.png and b/src/components/Subscribe/__screenshots__/Subscribe-variants-popup-webkit-linux.png differ diff --git a/src/components/Toc/__screenshots__/Hide-dropdown-chromium-linux.png b/src/components/Toc/__screenshots__/Hide-dropdown-chromium-linux.png index 71dd9cff..e9dc8aea 100644 Binary files a/src/components/Toc/__screenshots__/Hide-dropdown-chromium-linux.png and b/src/components/Toc/__screenshots__/Hide-dropdown-chromium-linux.png differ diff --git a/src/components/Toc/__screenshots__/Hide-dropdown-webkit-linux.png b/src/components/Toc/__screenshots__/Hide-dropdown-webkit-linux.png index 6991ed6f..b653f2a0 100644 Binary files a/src/components/Toc/__screenshots__/Hide-dropdown-webkit-linux.png and b/src/components/Toc/__screenshots__/Hide-dropdown-webkit-linux.png differ diff --git a/src/components/Toc/__screenshots__/Show-dropdown-chromium-linux.png b/src/components/Toc/__screenshots__/Show-dropdown-chromium-linux.png index 8e57e7c8..c1f3c75b 100644 Binary files a/src/components/Toc/__screenshots__/Show-dropdown-chromium-linux.png and b/src/components/Toc/__screenshots__/Show-dropdown-chromium-linux.png differ diff --git a/src/components/Toc/__screenshots__/Show-dropdown-webkit-linux.png b/src/components/Toc/__screenshots__/Show-dropdown-webkit-linux.png index c9aa9c6b..2c3b0257 100644 Binary files a/src/components/Toc/__screenshots__/Show-dropdown-webkit-linux.png and b/src/components/Toc/__screenshots__/Show-dropdown-webkit-linux.png differ diff --git a/src/components/Toc/__screenshots__/TOC-header-default-chromium-linux.png b/src/components/Toc/__screenshots__/TOC-header-default-chromium-linux.png index e29e86ea..238a1e67 100644 Binary files a/src/components/Toc/__screenshots__/TOC-header-default-chromium-linux.png and b/src/components/Toc/__screenshots__/TOC-header-default-chromium-linux.png differ diff --git a/src/components/Toc/__screenshots__/TOC-header-default-webkit-linux.png b/src/components/Toc/__screenshots__/TOC-header-default-webkit-linux.png index bbbdb3ef..a555d5c2 100644 Binary files a/src/components/Toc/__screenshots__/TOC-header-default-webkit-linux.png and b/src/components/Toc/__screenshots__/TOC-header-default-webkit-linux.png differ diff --git a/src/components/Toc/__screenshots__/TOC-header-hidden-chromium-linux.png b/src/components/Toc/__screenshots__/TOC-header-hidden-chromium-linux.png index f0ec9a6a..9830cc34 100644 Binary files a/src/components/Toc/__screenshots__/TOC-header-hidden-chromium-linux.png and b/src/components/Toc/__screenshots__/TOC-header-hidden-chromium-linux.png differ diff --git a/src/components/Toc/__screenshots__/TOC-header-hidden-webkit-linux.png b/src/components/Toc/__screenshots__/TOC-header-hidden-webkit-linux.png index 94a08960..43ecd02c 100644 Binary files a/src/components/Toc/__screenshots__/TOC-header-hidden-webkit-linux.png and b/src/components/Toc/__screenshots__/TOC-header-hidden-webkit-linux.png differ diff --git a/src/components/Toc/__screenshots__/TOC-header-shown-chromium-linux.png b/src/components/Toc/__screenshots__/TOC-header-shown-chromium-linux.png index e29e86ea..238a1e67 100644 Binary files a/src/components/Toc/__screenshots__/TOC-header-shown-chromium-linux.png and b/src/components/Toc/__screenshots__/TOC-header-shown-chromium-linux.png differ diff --git a/src/components/Toc/__screenshots__/TOC-header-shown-webkit-linux.png b/src/components/Toc/__screenshots__/TOC-header-shown-webkit-linux.png index bbbdb3ef..a555d5c2 100644 Binary files a/src/components/Toc/__screenshots__/TOC-header-shown-webkit-linux.png and b/src/components/Toc/__screenshots__/TOC-header-shown-webkit-linux.png differ diff --git a/src/components/TocLable/__screenshots__/TocLabel-default-chromium-linux.png b/src/components/TocLable/__screenshots__/TocLabel-default-chromium-linux.png index 63b53191..6e8e0649 100644 Binary files a/src/components/TocLable/__screenshots__/TocLabel-default-chromium-linux.png and b/src/components/TocLable/__screenshots__/TocLabel-default-chromium-linux.png differ diff --git a/src/components/TocLable/__screenshots__/TocLabel-default-firefox-linux.png b/src/components/TocLable/__screenshots__/TocLabel-default-firefox-linux.png index 14d28d1c..41fb99f4 100644 Binary files a/src/components/TocLable/__screenshots__/TocLabel-default-firefox-linux.png and b/src/components/TocLable/__screenshots__/TocLabel-default-firefox-linux.png differ diff --git a/src/components/TocLable/__screenshots__/TocLabel-default-webkit-linux.png b/src/components/TocLable/__screenshots__/TocLabel-default-webkit-linux.png index 9555ce68..0882f067 100644 Binary files a/src/components/TocLable/__screenshots__/TocLabel-default-webkit-linux.png and b/src/components/TocLable/__screenshots__/TocLabel-default-webkit-linux.png differ diff --git a/src/components/TocLable/__screenshots__/TocLabel-hover-out-chromium-linux.png b/src/components/TocLable/__screenshots__/TocLabel-hover-out-chromium-linux.png index 63b53191..6e8e0649 100644 Binary files a/src/components/TocLable/__screenshots__/TocLabel-hover-out-chromium-linux.png and b/src/components/TocLable/__screenshots__/TocLabel-hover-out-chromium-linux.png differ diff --git a/src/components/TocLable/__screenshots__/TocLabel-hover-out-firefox-linux.png b/src/components/TocLable/__screenshots__/TocLabel-hover-out-firefox-linux.png index 14d28d1c..41fb99f4 100644 Binary files a/src/components/TocLable/__screenshots__/TocLabel-hover-out-firefox-linux.png and b/src/components/TocLable/__screenshots__/TocLabel-hover-out-firefox-linux.png differ diff --git a/src/components/TocLable/__screenshots__/TocLabel-hover-out-webkit-linux.png b/src/components/TocLable/__screenshots__/TocLabel-hover-out-webkit-linux.png index 9555ce68..0882f067 100644 Binary files a/src/components/TocLable/__screenshots__/TocLabel-hover-out-webkit-linux.png and b/src/components/TocLable/__screenshots__/TocLabel-hover-out-webkit-linux.png differ diff --git a/src/components/TocLable/__screenshots__/TocLabel-tooltip-chromium-linux.png b/src/components/TocLable/__screenshots__/TocLabel-tooltip-chromium-linux.png index 823708b2..88b54f3b 100644 Binary files a/src/components/TocLable/__screenshots__/TocLabel-tooltip-chromium-linux.png and b/src/components/TocLable/__screenshots__/TocLabel-tooltip-chromium-linux.png differ diff --git a/src/components/TocLable/__screenshots__/TocLabel-tooltip-firefox-linux.png b/src/components/TocLable/__screenshots__/TocLabel-tooltip-firefox-linux.png index 88088e4a..f4933df0 100644 Binary files a/src/components/TocLable/__screenshots__/TocLabel-tooltip-firefox-linux.png and b/src/components/TocLable/__screenshots__/TocLabel-tooltip-firefox-linux.png differ diff --git a/src/components/TocLable/__screenshots__/TocLabel-tooltip-webkit-linux.png b/src/components/TocLable/__screenshots__/TocLabel-tooltip-webkit-linux.png index c3badee3..6600a911 100644 Binary files a/src/components/TocLable/__screenshots__/TocLabel-tooltip-webkit-linux.png and b/src/components/TocLable/__screenshots__/TocLabel-tooltip-webkit-linux.png differ diff --git a/src/styles/yfm.scss b/src/styles/yfm.scss index 9411914d..12fa4759 100644 --- a/src/styles/yfm.scss +++ b/src/styles/yfm.scss @@ -1,9 +1,46 @@ @use 'mixins'; @use 'variables'; +@use '@diplodoc/themes/lib/gravity/light.scss' as yfm-light; +@use '@diplodoc/themes/lib/gravity/dark.scss' as yfm-dark; +@use '@diplodoc/themes/lib/gravity/light-hc.scss' as yfm-light-hc; +@use '@diplodoc/themes/lib/gravity/dark-hc.scss' as yfm-dark-hc; + +// Применяем темизацию для YFM элементов + +.g-root_theme_light .dc-doc-page .yfm { + @include yfm-light.gravity-colors-for-diplodoc-light(); +} + +.g-root_theme_light-hc .dc-doc-page .yfm { + @include yfm-light-hc.gravity-colors-for-diplodoc-light-hc(); +} + +.g-root_theme_dark .dc-doc-page .yfm { + @include yfm-dark.gravity-colors-for-diplodoc-dark(); + + table[sticky-header] { + & th::before { + background: var(--yfm-color-base); + } + } + + .yfm-cut-title:before { + background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNiAxNiI+PHBhdGggc3Ryb2tlPSJyZ2JhKDI1NSwgMjU1LCAyNTUsIDAuNykiIGZpbGw9Im5vbmUiIGQ9Ik0zIDZsNSA1IDUtNSI+PC9wYXRoPjwvc3ZnPg=='); + } + + .yfm-tabs-accordion .yfm-tab:after { + background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNiAxNiI+PHBhdGggc3Ryb2tlPSJyZ2JhKDI1NSwgMjU1LCAyNTUsIDAuNykiIGZpbGw9Im5vbmUiIGQ9Ik0zIDZsNSA1IDUtNSI+PC9wYXRoPjwvc3ZnPg=='); + } +} + +.g-root_theme_dark-hc .dc-doc-page .yfm { + @include yfm-dark-hc.gravity-colors-for-diplodoc-dark-hc(); +} .dc-doc-page .yfm { - color: var(--g-color-text-primary); + color: var(--yfm-color-text); + // TODO: after determinate color for hljs in @diplodoc, remove this variables --yfm-color-hljs-background: var(--g-color-base-background); --yfm-color-hljs-subst: var(--g-color-text-complementary); --yfm-color-hljs-comment: var(--g-color-text-secondary); @@ -21,13 +58,11 @@ background: transparent; } - a:not(.pc-card-base-block) { - color: var(--g-color-text-link); + a { border-radius: var(--g-focus-border-radius); &:hover, &:active { - color: var(--g-color-text-link-hover); } @include mixins.focusable(0, 'box-shadow'); @@ -48,10 +83,10 @@ } $backgroundColors: ( - yfm-accent-info: var(--g-color-base-info-light), - yfm-accent-tip: var(--g-color-base-positive-light), - yfm-accent-alert: var(--g-color-base-danger-light), - yfm-accent-warning: var(--g-color-base-warning-light), + yfm-accent-info: var(--yfm-color-note-info-background), + yfm-accent-tip: var(--yfm-color-note-tip-background), + yfm-accent-alert: var(--yfm-color-note-important-background), + yfm-accent-warning: var(--yfm-color-note-warning-background), ); @each $type, $color in $backgroundColors { @@ -64,43 +99,34 @@ font-size: var(--dc-code-short-font-size); line-height: var(--dc-code-short-line-height); padding: var(--dc-code-short-padding); - background: var(--g-color-base-misc-light); - color: var(--g-color-text-misc); } pre > code { font-size: var(--dc-code-font-size); line-height: var(--dc-code-line-height); padding: 16px; - background: var(--g-color-base-misc-light); color: var(--g-color-text-complementary); } dfn, .inline_code_tooltip { - background: var(--g-color-base-float); - box-shadow: 0 8px 20px var(--g-color-sfx-shadow); + background: var(--yfm-color-term-dfn-background); + box-shadow: 0 8px 20px var(--yfm-color-term-dfn-shadow); } dfn:before, .inline_code_tooltip:before { - box-shadow: 0 0 0 1px var(--g-color-line-generic-solid); - } - - table { - color: var(--g-color-text-primary); - border-color: var(--g-color-line-generic); - background: var(--g-color-base-background); + box-shadow: 0 0 0 1px var(--yfm-color-term-dfn-pseudo-shadow); } table thead, table[sticky-header] thead th::after, table tr:nth-child(2n) { - background: var(--g-color-base-generic); + background: var(--yfm-color-table-row-background); } hr { - background-color: var(--g-color-base-background); + background-color: var(--yfm-color-base); } blockquote { @@ -108,7 +134,7 @@ } .yfm-tab-list { - border-bottom-color: var(--g-color-line-generic); + border-bottom-color: var(--yfm-color-border); } .yfm-tab { @@ -116,7 +142,7 @@ &:hover, &:active { - color: var(--g-color-text-link-hover); + color: var(--yfm-color-link-hover); } @include mixins.focusable(); } @@ -135,7 +161,7 @@ } .yfm-term_title:hover { - color: var(--g-color-text-link-hover); + color: var(--yfm-color-link-hover); } // Margin collapse is not applied for a block and header with a negative margin. @@ -181,7 +207,7 @@ .yfm-page__delimeter { height: 4px; border-radius: 2px; - background: var(--g-color-line-generic); + background: var(--yfm-color-border); margin-top: 20px; margin-bottom: 0; @@ -231,22 +257,6 @@ /* stylelint-enable declaration-no-important */ } -.g-root_theme_dark .dc-doc-page .yfm { - table[sticky-header] { - & th::before { - background: var(--g-color-base-background); - } - } - - .yfm-cut-title:before { - background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNiAxNiI+PHBhdGggc3Ryb2tlPSJyZ2JhKDI1NSwgMjU1LCAyNTUsIDAuNykiIGZpbGw9Im5vbmUiIGQ9Ik0zIDZsNSA1IDUtNSI+PC9wYXRoPjwvc3ZnPg=='); - } - - .yfm-tabs-accordion .yfm-tab:after { - background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNiAxNiI+PHBhdGggc3Ryb2tlPSJyZ2JhKDI1NSwgMjU1LCAyNTUsIDAuNykiIGZpbGw9Im5vbmUiIGQ9Ik0zIDZsNSA1IDUtNSI+PC9wYXRoPjwvc3ZnPg=='); - } -} - .dc-neuro-expert-widget { position: fixed; width: fit-content;