From f7be5c75bb99705b3f104e1921f2673b73bb0b42 Mon Sep 17 00:00:00 2001 From: Isaac Muse Date: Sat, 30 Apr 2022 08:50:18 -0600 Subject: [PATCH] Fixed issues related to latest Pygments and Pymdown Extensions (#3862) --- requirements.txt | 4 ++-- src/assets/javascripts/components/content/code/_/index.ts | 3 +-- src/assets/stylesheets/main/extensions/pymdownx/_tabbed.scss | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 92ce08e4a..724a0b530 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,5 +23,5 @@ jinja2>=2.11.1 markdown>=3.2 mkdocs>=1.3.0 mkdocs-material-extensions>=1.0.3 -pygments>=2.10,<2.12 -pymdown-extensions>=9.0,<9.4 +pygments>=2.12 +pymdown-extensions>=9.4 diff --git a/src/assets/javascripts/components/content/code/_/index.ts b/src/assets/javascripts/components/content/code/_/index.ts index afe141362..7826e3302 100644 --- a/src/assets/javascripts/components/content/code/_/index.ts +++ b/src/assets/javascripts/components/content/code/_/index.ts @@ -179,8 +179,7 @@ export function mountCodeBlock( /* Handle code annotations */ const container = el.closest([ - ":not(td):not(.code) > .highlight", - ".highlighttable" + ":not(td):not(.code) > .highlight" ].join(", ")) if (container instanceof HTMLElement) { const list = findCandidateList(container) diff --git a/src/assets/stylesheets/main/extensions/pymdownx/_tabbed.scss b/src/assets/stylesheets/main/extensions/pymdownx/_tabbed.scss index 05d6498df..cef1b4471 100644 --- a/src/assets/stylesheets/main/extensions/pymdownx/_tabbed.scss +++ b/src/assets/stylesheets/main/extensions/pymdownx/_tabbed.scss @@ -188,7 +188,7 @@ // previous (now deprecated) SuperFences code block grouping behavior > pre:first-child, > .highlight:first-child > pre:first-child, - > .highlighttable:first-child { + > .highlight:first-child > .highlighttable { margin: 0; // Remove rounded borders