Merge pull request #65 from Keldos-Li/develop

Fix footnote block, quote block, enhance inline code box Former-commit-id: 9884d71
Keldos-Li · Jan 17, 2022 · aa87fe8 · aa87fe8
2 parents 9976eac + 9f85c27
commit aa87fe8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - dev**
+  pull_request:
+    types: [opened, synchronize, reopened]
 
 jobs:
   compile:

diff --git a/Supplemental/sample-chinese.md b/Supplemental/sample-chinese.md
@@ -102,5 +102,5 @@ $$
 
 [TOC]
 
-[^1]: 从 https://en.wikipedia.org/wiki/Lorem_ipsum *Forke*得到
+[^1]: 从 https://en.wikipedia.org/wiki/Lorem_ipsum 整理得到
 
diff --git a/src/latex-theme.scss b/src/latex-theme.scss
@@ -406,18 +406,11 @@ blockquote {
   font-family: var(--quote-font), var(--base-Latin-font),
     var(--base-Chinese-font), -apple-system, serif;
   font-size: var(--quote-font-size);
-  border-left: 3px solid grey;
   /* 文字离左边框的距离 */
   padding-left: 16px;
   padding-right: 20pt;
   /* 左边框离页面边的距离 */
   margin-left: 20px;
-  @if $theme == "light" {
-    color: grey;
-  } @else if $theme == "dark" {
-    /* 文字颜色 */
-    color: #bfbfbf;
-  }
 }
 
 hr {
@@ -505,6 +498,10 @@ li {
 /* ============ 多级列表样式END ============ */
 
 /* 行内代码 */
+code {
+  font-family: var(--code-font), var(--ui-font), monospace; 
+}
+h1 code, h2 code, h3 code, h4 code, h5 code, h6 code,
 p code,
 li code {
   @if $theme == "light" {
@@ -585,6 +582,21 @@ h6.md-focus.md-heading:before {
   @extend %h6-with-count;
 }
 
+// 参考文献块
+.footnotes-area {
+  .footnote-line {
+    // 把参考资料块的文字大小和文字颜色与正文统一
+    color: var(--text-color);
+    font-size: var(--base-font-size);
+  }
+
+  // 默认情况下，Typora 会给参考文献块顶部加一条横线，这里把它隐藏掉
+  hr {
+    border: 0;
+    color: #00000000;
+  }
+}
+
 /* 目录 */
 .md-toc-content {
   margin-left: 2em;
@@ -595,14 +607,14 @@ h6.md-focus.md-heading:before {
 .md-toc-inner {
   margin-left: 0 !important;
   @if $theme == "light" {
-    color: black !important;
+    color: var(--text-color) !important;
   } @else if $theme == "dark" {
     color: #dddddd !important;
   }
 }
 .md-toc-item {
   @if $theme == "light" {
-    color: black !important;
+    color: var(--text-color) !important;
   } @else if $theme == "dark" {
     color: #dddddd !important;
   }