update

CHANGELOG.md

@@ -1,5 +1,13 @@
 # 更新日志
 
+## [1.5.0] 2021-09-02
+- 优化滚动条配色
+- 优文件列表配色
+
+
+## [1.4.0] 2020-06-28
+- panelSectionHeader
+
 ## [1.3.8] 2019-08-26
 - 优化列表的hover配色
 - 优化搜索框内的选项按钮的配色

README.md

@@ -1,4 +1,28 @@
+<<<<<<< HEAD
 # 米白色主题(Theme) 自用版
 > 自用版, 弱化了php的高亮。因为没法区分`.php文件`和`.phtml文件`, 所以单独分了个自用版。
 >> `其他人请使用普通版`
+=======
+# 米白色主题(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)
+
+## 截图预览
+![截图](./demo.jpg)
+
+
+## 安装(Installation)
+> 直接从插件管理器搜索`米白`下载即可。
+> 想看我的所有的插件,可以搜索 `yutent`
+
+
+## 问题(Issue)
+> 有任何问题,或建议, 都可以到[GitHub](https://github.com/yutent/one-plain.git) 提出。
+>>>>>>> master
 

build.js

@@ -4,8 +4,6 @@
  * @date 2018/12/01 13:33:44
  */
 
-'use strict'
-
 const fs = require('iofs')
 const path = require('path')
 
@@ -27,7 +25,7 @@ for (let it of tokenColors) {
 }
 
 const theme = {
-  name: '米白色主题',
+  name: '米白色主题@自用',
   type: 'light',
   colors,
   tokenColors

package.json

@@ -3,7 +3,7 @@
   "displayName": "one plain@own",
   "description": "🔥 米白色主题@自用",
   "icon": "logo.png",
-  "version": "1.0.0",
+  "version": "1.5.0",
   "publisher": "yutent",
   "author": "Yutent [@yutent]",
   "engines": {
@@ -23,16 +23,6 @@
       }
     ]
   },
-  "keywords": [
-    "theme",
-    "one",
-    "plain",
-    "one plain",
-    "mi",
-    "color",
-    "light",
-    "one-plain",
-    "yutent"
-  ],
+  "keywords": ["theme", "one", "plain", "one plain", "mi", "color", "light", "one-plain", "yutent"],
   "license": "MIT"
 }

src/colors.js

@@ -2,7 +2,6 @@ const vars = require('./var')
 
 module.exports = {
   focusBorder: vars.transparent,
-
   'editorLink.activeForeground': vars.common,
   'selection.background': '#80CBC440',
   'progressBar.background': '#80CBC4',
@@ -89,11 +88,11 @@ module.exports = {
   'dropdown.background': vars.white,
   'dropdown.border': '#00000010',
   'list.hoverForeground': vars.cyan1,
-  'list.hoverBackground': vars.plain1,
+  'list.hoverBackground': '#80CBC4',
   'list.activeSelectionBackground': vars.plain1,
   'list.activeSelectionForeground': '#80CBC4',
   'list.inactiveSelectionForeground': '#80CBC4',
-  'list.inactiveSelectionBackground': '#CCD7DA50',
+  'list.inactiveSelectionBackground': '#ccd7da50',
   'list.focusBackground': '#90A4AE20',
   'list.focusForeground': vars.common,
   'list.highlightForeground': '#80CBC4',
@@ -113,17 +112,17 @@ module.exports = {
   'terminal.ansiBrightMagenta': vars.magenta1,
   'terminal.ansiBrightRed': vars.red1,
   'terminal.ansiBrightYellow': vars.yellow1,
-  'scrollbar.shadow': vars.transparent,
-  'scrollbarSlider.background': vars.common + 30,
-  'scrollbarSlider.hoverBackground': vars.cyan1 + 50,
-  'scrollbarSlider.activeBackground': vars.cyan1,
+  'scrollbar.shadow': vars.plain2 + 50,
+  'scrollbarSlider.background': vars.cyan1 + 80,
+  'scrollbarSlider.hoverBackground': vars.cyan1 + 'aa',
+  'scrollbarSlider.activeBackground': vars.cyan1 + 'ee',
   'widget.shadow': vars.black + 20,
   'panel.border': vars.plain3,
   'panel.background': vars.plain1,
-  'panel.dropBackground': vars.common,
   'panelTitle.inactiveForeground': vars.common,
   'panelTitle.activeForeground': '#16967a',
   'panelTitle.activeBorder': '#3fc2a7',
+  'panelSectionHeader.background': vars.plain2,
   'diffEditor.insertedTextBackground': '#91B85915',
   'diffEditor.removedTextBackground': '#E5393520',
   'notifications.background': vars.white,

themes/color-theme.json

@@ -1,5 +1,5 @@
 {
-  "name": "米白色主题",
+  "name": "米白色主题@自用",
   "type": "light",
   "colors": {
     "focusBorder": "#ffffff00",
@@ -89,11 +89,11 @@
     "dropdown.background": "#ffffff",
     "dropdown.border": "#00000010",
     "list.hoverForeground": "#3fc2a7",
-    "list.hoverBackground": "#f8f9fd",
+    "list.hoverBackground": "#80CBC4",
     "list.activeSelectionBackground": "#f8f9fd",
     "list.activeSelectionForeground": "#80CBC4",
     "list.inactiveSelectionForeground": "#80CBC4",
-    "list.inactiveSelectionBackground": "#CCD7DA50",
+    "list.inactiveSelectionBackground": "#ccd7da50",
     "list.focusBackground": "#90A4AE20",
     "list.focusForeground": "#90a4ae",
     "list.highlightForeground": "#80CBC4",
@@ -113,17 +113,17 @@
     "terminal.ansiBrightMagenta": "#be7ee7",
     "terminal.ansiBrightRed": "#ff4628",
     "terminal.ansiBrightYellow": "#ffb62c",
-    "scrollbar.shadow": "#ffffff00",
-    "scrollbarSlider.background": "#90a4ae30",
-    "scrollbarSlider.hoverBackground": "#3fc2a750",
-    "scrollbarSlider.activeBackground": "#3fc2a7",
+    "scrollbar.shadow": "#f2f5fc50",
+    "scrollbarSlider.background": "#3fc2a780",
+    "scrollbarSlider.hoverBackground": "#3fc2a7aa",
+    "scrollbarSlider.activeBackground": "#3fc2a7ee",
     "widget.shadow": "#00000020",
     "panel.border": "#e8e9ed",
     "panel.background": "#f8f9fd",
-    "panel.dropBackground": "#90a4ae",
     "panelTitle.inactiveForeground": "#90a4ae",
     "panelTitle.activeForeground": "#16967a",
     "panelTitle.activeBorder": "#3fc2a7",
+    "panelSectionHeader.background": "#f2f5fc",
     "diffEditor.insertedTextBackground": "#91B85915",
     "diffEditor.removedTextBackground": "#E5393520",
     "notifications.background": "#ffffff",