From d88e92626a8f34bd8676d279542edc4f856377c0 Mon Sep 17 00:00:00 2001 From: Wang Shidong Date: Tue, 19 Jun 2018 21:04:14 +0800 Subject: [PATCH] Update colorscheme.vim (#1833) * Add material theme --- autoload/SpaceVim/layers/colorscheme.vim | 2 ++ .../SpaceVim/mapping/guide/theme/material.vim | 33 +++++++++++++++++++ wiki/en/Following-HEAD.md | 21 +++++++----- wiki/en/Home.md | 2 +- wiki/en/Project-layout.md | 33 +++++++++++++++++++ wiki/en/project_layout.md | 26 --------------- 6 files changed, 82 insertions(+), 35 deletions(-) create mode 100644 autoload/SpaceVim/mapping/guide/theme/material.vim create mode 100644 wiki/en/Project-layout.md delete mode 100644 wiki/en/project_layout.md diff --git a/autoload/SpaceVim/layers/colorscheme.vim b/autoload/SpaceVim/layers/colorscheme.vim index 4cd14c6bf..bbc1ca93b 100644 --- a/autoload/SpaceVim/layers/colorscheme.vim +++ b/autoload/SpaceVim/layers/colorscheme.vim @@ -35,6 +35,7 @@ function! SpaceVim#layers#colorscheme#plugins() abort \ ['arcticicestudio/nord-vim', { 'merged' : 0 }], \ ['icymind/NeoSolarized', { 'merged' : 0 }], \ ['w0ng/vim-hybrid', { 'merged' : 0 }], + \ ['SpaceVim/vim-material', { 'merged' : 0}], \ ] " " TODO: @@ -56,6 +57,7 @@ let s:cs = [ \ 'nord', \ 'hybrid', \ 'NeoSolarized', + \ 'material', \ ] let s:NUMBER = SpaceVim#api#import('data#number') diff --git a/autoload/SpaceVim/mapping/guide/theme/material.vim b/autoload/SpaceVim/mapping/guide/theme/material.vim new file mode 100644 index 000000000..d4a0fe37f --- /dev/null +++ b/autoload/SpaceVim/mapping/guide/theme/material.vim @@ -0,0 +1,33 @@ +"============================================================================= +" material.vim --- material theme for SpaceVim +" Copyright (c) 2016-2017 Wang Shidong & Contributors +" Author: Wang Shidong < wsdjeg at 163.com > +" URL: https://spacevim.org +" License: GPLv3 +"============================================================================= + +" Red " #FF5370 " " #E53935 " +" Pink " #F07178 " " #FF5370 " +" Orange " #F78C6C " " #F76D47 " +" Yellow " #FFCB6B " " #FFB62C " +" Green " #C3E88D " " #91B859 " +" Pale Blue " #B2CCD6 " " #8796B0 " +" Cyan " #89DDFF " " #39ADB5 " +" Blue " #82AAFF " " #6182B8 " +" Purple " #C792EA " " #7C4DFF " +" Violet " #BB80B3 " " #945EB8 " +" Brown " #AB7967 " " #AB7967 " + +function! SpaceVim#mapping#guide#theme#material#palette() abort + return [ + \ ['#2E3440', '#39ADB5', 0, 2], + \ ['#D8DEE9', '#3E4452', 7, 8], + \ ['#D8DEE9', '#434C5E', 7, 8], + \ ['#4C566A', 8], + \ ['#2E3440', '#7C4DFF', 0, 14], + \ ['#2E3440', '#FF5370', 0, 11], + \ ['#2E3440', '#BF616A', 0, 1], + \ ['#2E3440', '#689d6a', 0, 72], + \ ['#2E3440', '#8f3f71', 0, 132], + \ ] +endfunction diff --git a/wiki/en/Following-HEAD.md b/wiki/en/Following-HEAD.md index a08e72ed0..e740e3f17 100644 --- a/wiki/en/Following-HEAD.md +++ b/wiki/en/Following-HEAD.md @@ -1,24 +1,29 @@ This page documents changes in master branch since last release v0.8.0 -### PreRelease +## PreRelease The next release is v0.9.0. -#### Added +### Added -#### Changed +- Add material theme ([#1833](https://github.com/SpaceVim/SpaceVim/pull/1833)) +- Add floobits layer ([#1697](https://github.com/SpaceVim/SpaceVim/pull/1697)) +- Add `SPC b b ` key binding in fzf layer ([#1725](https://github.com/SpaceVim/SpaceVim/pull/1725)) + +### Changed - Change the option name `enable_statusline_display_mode` to `enable_statusline_mode` ([#1843](https://github.com/SpaceVim/SpaceVim/pull/1843)) -#### Removed +### Removed -#### Doc +### Doc, Wiki && Website -#### Wiki && Website +- Update version to v0.9.0-dev ([#1842](https://github.com/SpaceVim/SpaceVim/pull/1842)) +- Update faq for why using toml ([#1838](https://github.com/SpaceVim/SpaceVim/pull/1838)) -#### Others +### Others -### Latest Release +## Latest Release SpaceVim releases v0.8.0 at 2018-06-18, please check the [release page](https://spacevim.org/SpaceVim-release-v0.8.0/) for all the details diff --git a/wiki/en/Home.md b/wiki/en/Home.md index a51131342..d0dcb6517 100644 --- a/wiki/en/Home.md +++ b/wiki/en/Home.md @@ -5,7 +5,7 @@ welcome to - [FAQ](https://spacevim.org/faq/): The most asked questions about SpaceVim - [Progress/Roadmap](https://spacevim.org/roadmap/): The roadmap and development progress of SpaceVim - [Blogs](https://spacevim.org/blog/): Latest news and posts about SpaceVim -- [Project layout](project_layout): Layout of current project +- [Project layout](Project-layout): Layout of current project ### Users diff --git a/wiki/en/Project-layout.md b/wiki/en/Project-layout.md new file mode 100644 index 000000000..83c906ef9 --- /dev/null +++ b/wiki/en/Project-layout.md @@ -0,0 +1,33 @@ +This is the project layout of SpaceVim org: + +| Repo name | Description | +| ------------------------------------------------------------------------- | -------------------------------------------------------- | +| [SpaceVim/SpaceVim](https://github.com/SpaceVim/SpaceVim) | SpaceVim main repo | +| [SpaceVim/Ctrlp-extensions](https://github.com/SpaceVim/Ctrlp-extensions) | Ctrlp extensions used in ctrlp layer | +| [SpaceVim/Unite-sources](https://github.com/SpaceVim/Unite-sources) | Unite sources used in unite layer | +| [SpaceVim/Denite-sources](https://github.com/SpaceVim/Denite-sources) | Denite sources used in denite layer | +| [SpaceVim/unite-ctags](https://github.com/SpaceVim/unite-ctags) | A fork of voi/unite-ctags | +| [SpaceVim/gtags.vim](https://github.com/SpaceVim/gtags.vim) | SpaceVim tags layer: gtags.vim | +| [SpaceVim/cscope.vim](https://github.com/SpaceVim/cscope.vim) | A cscope plugin for vim/neovim | +| [SpaceVim/vim-swig](https://github.com/SpaceVim/vim-swig) | Swig vim syntax highlighting | +| [SpaceVim/vim-luacomplete](https://github.com/SpaceVim/vim-luacomplete) | lua complete plugin for vim | +| [SpaceVim/unite-unicode](https://github.com/SpaceVim/unite-unicode) | Unite.vim plugin to insert unicode gyphs | +| [SpaceVim/vim-material](https://github.com/SpaceVim/vim-material) | Vim colorscheme inspired by equinusocio's Material Theme | + +In the main repo, the layout is: + +```txt +├─ .ci/ build automation +├─ .github/ issue/PR templates +├─ .SpaceVim.d/ project specific configuration +├─ autoload/SpaceVim.vim SpaceVim core file +├─ autoload/SpaceVim/api/ Public APIs +├─ autoload/SpaceVim/layers/ available layers +├─ autoload/SpaceVim/plugins/ buildin plugins +├─ autoload/SpaceVim/mapping/ mapping guide +├─ doc/ help(cn/en) +├─ docs/ website(cn/en) +├─ wiki/ wiki(cn/en) +├─ bin/ executable +└─ test/ tests +``` diff --git a/wiki/en/project_layout.md b/wiki/en/project_layout.md deleted file mode 100644 index 0ecb6752f..000000000 --- a/wiki/en/project_layout.md +++ /dev/null @@ -1,26 +0,0 @@ -This is the project layout of SpaceVim org: - -| Repo name | Description | -| ------------------------------------------------------------------------- | ---------------------------------------- | -| [SpaceVim/SpaceVim](https://github.com/SpaceVim/SpaceVim) | SpaceVim main repo | -| [SpaceVim/Ctrlp-extensions](https://github.com/SpaceVim/Ctrlp-extensions) | Ctrlp extensions used in ctrlp layer | -| [SpaceVim/Unite-sources](https://github.com/SpaceVim/Unite-sources) | Unite sources used in unite layer | -| [SpaceVim/Denite-sources](https://github.com/SpaceVim/Denite-sources) | Denite sources used in denite layer | -| [SpaceVim/unite-ctags](https://github.com/SpaceVim/unite-ctags) | A fork of voi/unite-ctags | -| [SpaceVim/gtags.vim](https://github.com/SpaceVim/gtags.vim) | SpaceVim tags layer: gtags.vim | -| [SpaceVim/cscope.vim](https://github.com/SpaceVim/cscope.vim) | A cscope plugin for vim/neovim | -| [SpaceVim/vim-swig](https://github.com/SpaceVim/vim-swig) | Swig vim syntax highlighting | -| [SpaceVim/vim-luacomplete](https://github.com/SpaceVim/vim-luacomplete) | lua complete plugin for vim | -| [SpaceVim/unite-unicode](https://github.com/SpaceVim/unite-unicode) | Unite.vim plugin to insert unicode gyphs | - -In the main repo, the layout is: - - ├─ autoload/SpaceVim/api/ APIs - ├─ autoload/SpaceVim/layers/ layers - ├─ autoload/SpaceVim/plugins/ plugins - ├─ autoload/SpaceVim/mapping/ mapping guide - ├─ doc/SpaceVim.txt help - ├─ docs/ website - ├─ wiki/ wiki - ├─ bin/ executable - └─ test/ tests