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}' 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 `