From 7988b905fd0758816a24b2c569bccf98ee5ec7ec Mon Sep 17 00:00:00 2001 From: ashfinal Date: Mon, 28 Dec 2020 23:20:35 +0800 Subject: [PATCH] Revert "Add VertSplit border; Clear Folded background" --- .github/workflows/main.yml | 30 ------------------------------ colors/one.vim | 4 ++-- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 213dfbc..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Automatic merge from upstream - -on: - schedule: - # * is a special character in YAML so you have to quote this string - - cron: '0 0 * * *' - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - name: Sync upstream changes every day - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_ACTOR: ${{ github.actor }} - GITHUB_REPO: ${{ github.repository }} - run: | - REMOTE_REPO="rakr/vim-one" - git config user.email "actions@github.com" - git config user.name "GitHub Merge Action" - git checkout master - git remote set-url origin "https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPO" - git remote add upstream "https://github.com/$REMOTE_REPO" - git fetch upstream - git merge upstream/master - git remote rm upstream - git push origin HEAD:master diff --git a/colors/one.vim b/colors/one.vim index 54747c3..1de938a 100644 --- a/colors/one.vim +++ b/colors/one.vim @@ -364,8 +364,8 @@ if has('gui_running') || has('termguicolors') || &t_Co == 88 || &t_Co == 256 call X('CursorLine', '', s:syntax_cursor, 'none') call X('Directory', s:hue_2, '', '') call X('ErrorMsg', s:hue_5, s:syntax_bg, 'none') - call X('VertSplit', s:syntax_cursor, s:syntax_cursor, 'none') - call X('Folded', s:syntax_fg, s:syntax_bg, 'none') + call X('VertSplit', s:vertsplit, '', 'none') + call X('Folded', s:syntax_bg, s:syntax_fold_bg, 'none') call X('FoldColumn', s:mono_3, s:syntax_cursor, '') call X('IncSearch', s:hue_6, '', '') call X('LineNr', s:mono_4, '', '')