fix: fix wrap code block line formatter, prevent duplicated id

lepture · Apr 8, 2024 · 626f8de · 626f8de
1 parent f5e05b8
commit 626f8de
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/src/shibuya/_sphinx.py b/src/shibuya/_sphinx.py
@@ -33,3 +33,12 @@ class WrapLineFormatter(HtmlFormatter):
     def __init__(self, **options):
         options.setdefault('linespans', 1)
         super().__init__(**options)
+
+    def _wrap_linespans(self, inner):
+        i = self.linenostart - 1
+        for t, line in inner:
+            if t:
+                i += 1
+                yield 1, '<span data-line="%d">%s</span>' % (i, line)
+            else:
+                yield 0, line
diff --git a/src/shibuya/theme/shibuya/components/searchbox.html b/src/shibuya/theme/shibuya/components/searchbox.html
@@ -0,0 +1 @@
+{% include "searchbox.html" %}
diff --git a/src/shibuya/theme/shibuya/components/site-head.html b/src/shibuya/theme/shibuya/components/site-head.html
@@ -23,7 +23,7 @@
         {%- endif -%}
       </nav>
       <div class="sy-head-extra flex items-center print:hidden">
-        {%- include "searchbox.html" %}
+        {% include "components/searchbox.html" %}
         {% include "components/nav-versions.html" %}
         {% include "components/nav-languages.html" %}
         <div class="sy-head-social flex items-center">

diff --git a/static/css/contents/yue.css b/static/css/contents/yue.css
@@ -280,6 +280,10 @@
   font-size: 0.9em;
 }
 
+.yue kbd {
+  font-family: var(--sy-f-mono);
+}
+
 .yue video {
   margin-top: 2em;
   margin-bottom: 2em;

diff --git a/static/css/variables.css b/static/css/variables.css
@@ -3,7 +3,7 @@
   --sy-f-cjk: PingFang SC, Hiragino Sans GB, Droid Sans Fallback, Microsoft YaHei;
   --sy-f-heading: var(--sy-f-sys), var(--sy-f-cjk), sans-serif;
   --sy-f-text: var(--sy-f-sys), var(--sy-f-cjk), sans-serif;
-  --sy-f-mono: Menlo, Monaco, Consolas, "Courier New", monospace;
+  --sy-f-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   --sy-s-banner-height: 0rem;
   --sy-s-navbar-height: 56px;
   --sy-s-offset-top: calc(var(--sy-s-navbar-height) + var(--sy-s-banner-height));