From baf36562a6a5f69a6a98c140bfc1a82e4e6f1a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=87=E5=A4=A9?= Date: Mon, 30 Mar 2020 20:32:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E7=94=A8=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 24 +----- package.json | 8 +- src/colors.js | 9 +- src/php.js | 187 +++++++++------------------------------- themes/color-theme.json | 127 ++++----------------------- 5 files changed, 69 insertions(+), 286 deletions(-) diff --git a/README.md b/README.md index 1c059fe..98f3010 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,4 @@ -# 米白色主题(Theme) -> 米白色主题, vscode专用。包括UI和代码高亮, 都精心调整好对比度。优雅,耐看。 喜欢浅色系的童鞋, 不要错过。 ->> 目前主题精心适配 `ts,js,scss,css,html,php,md,json`等语言的高亮, 其他语言适配, 如发现有不正常的高亮可以到[GitHub](https://github.com/yutent/one-plain.git)反馈, 我会第一时间适配。 - - -[![Version](https://vsmarketplacebadge.apphb.com/version-short/yutent.one-plain.svg)](https://marketplace.visualstudio.com/items?itemName=yutent.one-plain) -[![Rating](https://vsmarketplacebadge.apphb.com/rating-short/yutent.one-plain.svg)](https://marketplace.visualstudio.com/items?itemName=yutent.one-plain) -[![Installs](https://vsmarketplacebadge.apphb.com/installs/yutent.one-plain.svg)](https://marketplace.visualstudio.com/items?itemName=yutent.one-plain) -[![Build Status](https://travis-ci.org/yutent/one-plain.svg?branch=master)](https://travis-ci.org/yutent/one-plain) - -## 截图预览 -![截图](https://attach.cdn.doui.cc/one-plain.png?t=20181211) - - -## 安装(Installation) -> 直接从插件管理器搜索`米白`下载即可。 -> 想看我的所有的插件,可以搜索 `yutent` - - -## 问题(Issue) -> 有任何问题,或建议, 都可以到[GitHub](https://github.com/yutent/one-plain.git) 提出。 +# 米白色主题(Theme) 自用版 +> 自用版, 弱化了php的高亮。因为没法区分`.php文件`和`.phtml文件`, 所以单独分了个自用版。 +>> `其他人请使用普通版` diff --git a/package.json b/package.json index ba362f7..bf9deb1 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { - "name": "one-plain", - "displayName": "one plain", - "description": "🔥 米白色主题", + "name": "one-plain~own", + "displayName": "one plain@own", + "description": "🔥 米白色主题@自用", "icon": "logo.png", - "version": "1.3.8", + "version": "1.0.0", "publisher": "yutent", "author": "Yutent [@yutent]", "engines": { diff --git a/src/colors.js b/src/colors.js index f0789e2..e3b13ee 100644 --- a/src/colors.js +++ b/src/colors.js @@ -2,7 +2,7 @@ const vars = require('./var') module.exports = { focusBorder: vars.transparent, - 'scrollbar.shadow': vars.transparent, + 'editorLink.activeForeground': vars.common, 'selection.background': '#80CBC440', 'progressBar.background': '#80CBC4', @@ -113,9 +113,10 @@ module.exports = { 'terminal.ansiBrightMagenta': vars.magenta1, 'terminal.ansiBrightRed': vars.red1, 'terminal.ansiBrightYellow': vars.yellow1, - 'scrollbarSlider.background': vars.common + 20, - 'scrollbarSlider.hoverBackground': vars.common + 10, - 'scrollbarSlider.activeBackground': '#80CBC4', + 'scrollbar.shadow': vars.transparent, + 'scrollbarSlider.background': vars.common + 30, + 'scrollbarSlider.hoverBackground': vars.cyan1 + 50, + 'scrollbarSlider.activeBackground': vars.cyan1, 'widget.shadow': vars.black + 20, 'panel.border': vars.plain3, 'panel.background': vars.plain1, diff --git a/src/php.js b/src/php.js index 5c47eff..e77afc6 100644 --- a/src/php.js +++ b/src/php.js @@ -2,167 +2,64 @@ const vars = require('./var') module.exports = [ { - name: 'PHP Constants', + name: 'Class name php', scope: [ - 'constant.other.php', - 'support.constant.ext.php', - 'support.constant.std.php,support.constant.core.php', - 'support.constant.parser-token.php', - 'constant' + 'support.function.construct.php', + 'variable.other.php', + 'keyword.operator.logical.php', + 'punctuation.definition.variable.php', + 'string.quoted.single.php', + 'constant.numeric.decimal.php', + 'support.function.array.php', + 'support.function.mbstring.php', + + 'variable.other.global.safer.php', + 'support.function.datetime.php' ], settings: { - foreground: '#ffb62c' + foreground: '#a7beca', + fontStyle: 'italic' } }, { name: 'Class name php', - scope: 'variable.other.class.php', - settings: { - foreground: '#e06c75' - } - }, - - // 变量 - { - name: 'php dollar sign', - scope: ['punctuation.definition.variable.php'], - settings: { - foreground: vars.common2 - } - }, - - // $this - { - name: 'php dollar sign', scope: [ - 'variable.language.this.php', - 'variable.language.this.php punctuation.definition.variable.php' + 'punctuation.section.embedded.begin.php', + 'punctuation.section.embedded.end.php', + 'punctuation.terminator.statement.php', + 'punctuation.definition.begin.bracket.round.php', + 'punctuation.definition.end.bracket.round.php', + 'punctuation.definition.arguments.begin.bracket.round.php', + 'punctuation.definition.arguments.end.bracket.round.php', + 'punctuation.terminator.expression.php', + 'punctuation.section.array.begin.php', + 'punctuation.section.array.end.php', + 'punctuation.definition.string.begin.php', + 'punctuation.definition.string.end.php', + 'keyword.control.if.php', + 'keyword.control.elseif.php', + 'keyword.control.endif.php', + 'keyword.control.foreach.php', + 'keyword.control.endforeach.php', + 'keyword.control.import.include.php' ], settings: { - foreground: vars.red1 - } - }, - - { - name: 'php build in function', - scope: ['meta.function-call.php support.function'], - settings: { - fontStyle: 'italic', - foreground: vars.magenta1 - } - }, - - { - name: 'php heredoc/nowdoc', - scope: 'keyword.operator.heredoc.php,keyword.operator.nowdoc.php', - settings: { - foreground: '#c678dd' + foreground: vars.grey1, + fontStyle: 'italic' } }, { - name: 'php goto', - scope: 'entity.name.goto-label.php,support.other.php', - settings: { - foreground: '#61AFEF' - } - }, - { - name: 'php logical/bitwise operator', - scope: - 'keyword.operator.logical.php,keyword.operator.bitwise.php,keyword.operator.arithmetic.php', - settings: { - foreground: '#56b6c2' - } - }, - { - name: 'php regexp operator', - scope: 'keyword.operator.regexp.php', - settings: { - foreground: '#c678dd' - } - }, - { - name: 'php comparison', - scope: 'keyword.operator.comparison.php', - settings: { - foreground: '#56b6c2' - } - }, - - { - name: 'php instanceof', - scope: 'keyword.operator.type.php', - settings: { - foreground: '#c678dd' - } - }, - - { - name: 'php illegal.non-null-typehinted', - scope: 'invalid.illegal.non-null-typehinted.php', - settings: { - foreground: '#f44747' - } - }, - { - name: 'php types', + name: 'Class name php', scope: [ - [ - 'storage.type.php', - 'meta.other.type.phpdoc.php', - 'keyword.other.type.php', - 'keyword.other.array.phpdoc.php' - ] + 'keyword.operator.comparison.php', + 'keyword.operator.ternary.php', + 'keyword.operator.assignment.php', + 'keyword.operator.string.php', + 'keyword.operator.key.php' ], settings: { - foreground: '#ffb62c', - fontStyle: 'bold italic' - } - }, - { - name: 'php call-function', - scope: [ - 'meta.function-call.php', - 'meta.function-call.object.php', - 'meta.function-call.static.php' - ], - settings: { - foreground: '#61AFEF' - } - }, - { - name: 'laravel blade tag', - scope: [ - 'text.html.laravel-blade', - 'source.php.embedded.line.html', - 'entity.name.tag.laravel-blade' - ], - settings: { - foreground: '#c678dd' - } - }, - { - name: 'laravel blade @', - scope: [ - 'text.html.laravel-blade', - 'source.php.embedded.line.html', - 'support.constant.laravel-blade' - ], - settings: { - foreground: '#c678dd' - } - }, - { - name: 'use statement for other classes', - scope: [ - 'support.other.namespace.use.php', - 'support.other.namespace.use-as.php', - 'support.other.namespace.php', - 'entity.other.alias.php', - 'meta.interface.php' - ], - settings: { - foreground: '#E5C07B' + foreground: vars.plain3, + fontStyle: 'italic' } } ] diff --git a/themes/color-theme.json b/themes/color-theme.json index eec76b4..4711ff9 100644 --- a/themes/color-theme.json +++ b/themes/color-theme.json @@ -3,7 +3,6 @@ "type": "light", "colors": { "focusBorder": "#ffffff00", - "scrollbar.shadow": "#ffffff00", "editorLink.activeForeground": "#90a4ae", "selection.background": "#80CBC440", "progressBar.background": "#80CBC4", @@ -114,9 +113,10 @@ "terminal.ansiBrightMagenta": "#be7ee7", "terminal.ansiBrightRed": "#ff4628", "terminal.ansiBrightYellow": "#ffb62c", - "scrollbarSlider.background": "#90a4ae20", - "scrollbarSlider.hoverBackground": "#90a4ae10", - "scrollbarSlider.activeBackground": "#80CBC4", + "scrollbar.shadow": "#ffffff00", + "scrollbarSlider.background": "#90a4ae30", + "scrollbarSlider.hoverBackground": "#3fc2a750", + "scrollbarSlider.activeBackground": "#3fc2a7", "widget.shadow": "#00000020", "panel.border": "#e8e9ed", "panel.background": "#f8f9fd", @@ -591,124 +591,27 @@ } }, { - "name": "PHP Constants", - "scope": "constant.other.php, support.constant.ext.php, support.constant.std.php,support.constant.core.php, support.constant.parser-token.php, constant", + "name": "Class name php", + "scope": "support.function.construct.php, variable.other.php, keyword.operator.logical.php, punctuation.definition.variable.php, string.quoted.single.php, constant.numeric.decimal.php, support.function.array.php, support.function.mbstring.php, variable.other.global.safer.php, support.function.datetime.php", "settings": { - "foreground": "#ffb62c" + "foreground": "#a7beca", + "fontStyle": "italic" } }, { "name": "Class name php", - "scope": "variable.other.class.php", + "scope": "punctuation.section.embedded.begin.php, punctuation.section.embedded.end.php, punctuation.terminator.statement.php, punctuation.definition.begin.bracket.round.php, punctuation.definition.end.bracket.round.php, punctuation.definition.arguments.begin.bracket.round.php, punctuation.definition.arguments.end.bracket.round.php, punctuation.terminator.expression.php, punctuation.section.array.begin.php, punctuation.section.array.end.php, punctuation.definition.string.begin.php, punctuation.definition.string.end.php, keyword.control.if.php, keyword.control.elseif.php, keyword.control.endif.php, keyword.control.foreach.php, keyword.control.endforeach.php, keyword.control.import.include.php", "settings": { - "foreground": "#e06c75" + "foreground": "#c7c8cb", + "fontStyle": "italic" } }, { - "name": "php dollar sign", - "scope": "punctuation.definition.variable.php", + "name": "Class name php", + "scope": "keyword.operator.comparison.php, keyword.operator.ternary.php, keyword.operator.assignment.php, keyword.operator.string.php, keyword.operator.key.php", "settings": { - "foreground": "#546e7a" - } - }, - { - "name": "php dollar sign", - "scope": "variable.language.this.php, variable.language.this.php punctuation.definition.variable.php", - "settings": { - "foreground": "#ff4628" - } - }, - { - "name": "php build in function", - "scope": "meta.function-call.php support.function", - "settings": { - "fontStyle": "italic", - "foreground": "#be7ee7" - } - }, - { - "name": "php heredoc/nowdoc", - "scope": "keyword.operator.heredoc.php,keyword.operator.nowdoc.php", - "settings": { - "foreground": "#c678dd" - } - }, - { - "name": "php goto", - "scope": "entity.name.goto-label.php,support.other.php", - "settings": { - "foreground": "#61AFEF" - } - }, - { - "name": "php logical/bitwise operator", - "scope": "keyword.operator.logical.php,keyword.operator.bitwise.php,keyword.operator.arithmetic.php", - "settings": { - "foreground": "#56b6c2" - } - }, - { - "name": "php regexp operator", - "scope": "keyword.operator.regexp.php", - "settings": { - "foreground": "#c678dd" - } - }, - { - "name": "php comparison", - "scope": "keyword.operator.comparison.php", - "settings": { - "foreground": "#56b6c2" - } - }, - { - "name": "php instanceof", - "scope": "keyword.operator.type.php", - "settings": { - "foreground": "#c678dd" - } - }, - { - "name": "php illegal.non-null-typehinted", - "scope": "invalid.illegal.non-null-typehinted.php", - "settings": { - "foreground": "#f44747" - } - }, - { - "name": "php types", - "scope": "storage.type.php,meta.other.type.phpdoc.php,keyword.other.type.php,keyword.other.array.phpdoc.php", - "settings": { - "foreground": "#ffb62c", - "fontStyle": "bold italic" - } - }, - { - "name": "php call-function", - "scope": "meta.function-call.php, meta.function-call.object.php, meta.function-call.static.php", - "settings": { - "foreground": "#61AFEF" - } - }, - { - "name": "laravel blade tag", - "scope": "text.html.laravel-blade, source.php.embedded.line.html, entity.name.tag.laravel-blade", - "settings": { - "foreground": "#c678dd" - } - }, - { - "name": "laravel blade @", - "scope": "text.html.laravel-blade, source.php.embedded.line.html, support.constant.laravel-blade", - "settings": { - "foreground": "#c678dd" - } - }, - { - "name": "use statement for other classes", - "scope": "support.other.namespace.use.php, support.other.namespace.use-as.php, support.other.namespace.php, entity.other.alias.php, meta.interface.php", - "settings": { - "foreground": "#E5C07B" + "foreground": "#e8e9ed", + "fontStyle": "italic" } }, {