From 0b5803e19964b982b181466196f52d56c4e38794 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 14:52:45 +0100 Subject: [PATCH 01/17] Bump follow-redirects from 1.13.0 to 1.14.7 (#320) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.0 to 1.14.7. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.0...v1.14.7) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 13 +++---------- yarn.lock | 6 +++--- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2bca0cea..65d720a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3952,13 +3952,6 @@ "integrity": "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==", "requires": { "follow-redirects": "^1.14.0" - }, - "dependencies": { - "follow-redirects": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", - "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==" - } } }, "axobject-query": { @@ -7846,9 +7839,9 @@ } }, "follow-redirects": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz", - "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==" + "version": "1.14.7", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", + "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==" }, "for-in": { "version": "1.0.2", diff --git a/yarn.lock b/yarn.lock index d99c54f0..999817fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5968,9 +5968,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0, follow-redirects@^1.14.0: - version "1.14.5" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" - integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA== + version "1.14.7" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== for-in@^1.0.2: version "1.0.2" From eeea8c575a09b3951f6ce69962a198e9cfef011e Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Tue, 18 Jan 2022 16:05:08 +0100 Subject: [PATCH 02/17] Fix/issue 322 markdown in toc (#326) * refine style of ArticleToc borders * Get content of the ArticleHeading instance using all tokens available in ipynb logic fix #322 * add browser tooltip to get the full plain text of the items in the table of contents --- src/components/ArticleV2/ArticleToC.js | 4 ++-- src/components/ArticleV2/ArticleToCStep.js | 2 +- src/logic/ipynb.js | 28 ++++++++++++++++++++-- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/components/ArticleV2/ArticleToC.js b/src/components/ArticleV2/ArticleToC.js index c388d1f7..978988f8 100644 --- a/src/components/ArticleV2/ArticleToC.js +++ b/src/components/ArticleV2/ArticleToC.js @@ -184,7 +184,7 @@ const ArticleToC = ({ __html: binderUrl ? t('actions.gotoBinder', { binderUrl }) : t('errors.binderUrlNotAvailable') }}/> -
+
{steps.map((step, i) => { const showBookmark = i < steps.length - 1 ? selectedCellIdx >= step.cell.idx && selectedCellIdx < steps[i+1].cell.idx @@ -231,7 +231,7 @@ const ArticleToC = ({ isSectionStart isSectionEnd selected - active + active={false} className='' onStepClick={(e) => onSectionClickHandler(e, DisplayLayerSectionBibliography)} >{t('bibliography')} diff --git a/src/components/ArticleV2/ArticleToCStep.js b/src/components/ArticleV2/ArticleToCStep.js index a31ed7e1..819e83e3 100644 --- a/src/components/ArticleV2/ArticleToCStep.js +++ b/src/components/ArticleV2/ArticleToCStep.js @@ -34,7 +34,7 @@ const ArticleToCStep = ({
-