From c2ed645ec6241a240a94f1f25ffeeedd57990ec6 Mon Sep 17 00:00:00 2001
From: yanglbme <szuyanglb@outlook.com>
Date: Fri, 11 Sep 2020 20:35:35 +0800
Subject: [PATCH 1/2] fix: update wx-renderer

---
 src/assets/scripts/renderers/wx-renderer.js | 5 -----
 src/assets/scripts/themes/default-theme.js  | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/assets/scripts/renderers/wx-renderer.js b/src/assets/scripts/renderers/wx-renderer.js
index 04e9cae..ff4805d 100644
--- a/src/assets/scripts/renderers/wx-renderer.js
+++ b/src/assets/scripts/renderers/wx-renderer.js
@@ -21,10 +21,6 @@ const WxRenderer = function (opts) {
         for (let ele in themeTpl.inline) {
             if (themeTpl.inline.hasOwnProperty(ele)) {
                 let style = themeTpl.inline[ele]
-                if (ele === 'codespan') {
-                    style['font-family'] = CODE_FONT_FAMILY
-                    style['white-space'] = 'normal'
-                }
                 mapping[ele] = merge(base, style)
             }
         }
@@ -70,7 +66,6 @@ const WxRenderer = function (opts) {
         return `
             <style>
             .preview-wrapper pre::before {
-                font-family: "SourceSansPro", "HelveticaNeue", Arial, sans-serif;
                 position: absolute;
                 top: 0;
                 right: 0;
diff --git a/src/assets/scripts/themes/default-theme.js b/src/assets/scripts/themes/default-theme.js
index 77e4cf6..aa8eac6 100644
--- a/src/assets/scripts/themes/default-theme.js
+++ b/src/assets/scripts/themes/default-theme.js
@@ -69,7 +69,6 @@ export default  {
         blockquote_p: {
             'letter-spacing': '0.1em',
             'color': 'rgb(80, 80, 80)',
-            'font-family': 'PingFangSC-light, PingFangTC-light, Open Sans, Helvetica Neue, sans-serif',
             'font-size': '1em',
             'display': 'block',
         },

From fdd2ee71e733c59e467e7a1f9d6fe391e20e039a Mon Sep 17 00:00:00 2001
From: yanglbme <szuyanglb@outlook.com>
Date: Sun, 13 Sep 2020 11:26:24 +0800
Subject: [PATCH 2/2] feat: add branch-merge action

---
 .github/workflows/branch-merge.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/branch-merge.yml

diff --git a/.github/workflows/branch-merge.yml b/.github/workflows/branch-merge.yml
new file mode 100644
index 0000000..05f7b15
--- /dev/null
+++ b/.github/workflows/branch-merge.yml
@@ -0,0 +1,17 @@
+name: Merge Branch
+
+on:
+  push:
+    branches: [ imgbot ]
+
+jobs:
+  merge-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: everlytic/branch-merge@1.1.0
+        with:
+          github_token: ${{ github.token }}
+          source_ref: ${{ github.ref }}
+          target_branch: 'master'
+          commit_message_template: '[Automated] Merged {source_ref} into {target_branch}'