From 7e39fdb9e5ea70fc8a1c48d7a35762f88fe49abb Mon Sep 17 00:00:00 2001 From: yamatsum Date: Fri, 3 Sep 2021 16:29:26 +0900 Subject: [PATCH 01/11] feat: add editorBracketHighlight to classic. --- src/classic/theme.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/classic/theme.js b/src/classic/theme.js index 578c039..2c31521 100644 --- a/src/classic/theme.js +++ b/src/classic/theme.js @@ -178,7 +178,31 @@ function getTheme({ style, name }) { "panelInput.border": pick({ light: primer.gray[2], dark: primer.gray[1] }), "terminal.foreground": primer.gray[6], + "terminal.background": primer.gray[0], "terminal.tab.activeBorder": "#f9826c", + "terminal.ansiBlack": primer.gray[3], + "terminal.ansiRed": primer.red[6], + "terminal.ansiGreen": primer.green[6], + "terminal.ansiYellow": primer.yellow[6], + "terminal.ansiBlue": primer.blue[6], + "terminal.ansiMagenta": primer.purple[6], + "terminal.ansiCyan": "#9ecbff", + "terminal.ansiWhite": primer.white, + "terminal.ansiBrightBlack": primer.gray[3], + "terminal.ansiBrightRed": primer.red[6], + "terminal.ansiBrightGreen": primer.green[6], + "terminal.ansiBrightYellow": primer.yellow[6], + "terminal.ansiBrightBlue": primer.blue[6], + "terminal.ansiBrightMagenta": primer.purple[6], + "terminal.ansiBrightCyan": "#9ecbff", + "terminal.ansiBrightWhite": primer.white, + + "editorBracketHighlight.foreground1": primer.blue[6], + "editorBracketHighlight.foreground2": primer.purple[6], + "editorBracketHighlight.foreground3": primer.orange[6], + "editorBracketHighlight.foreground4": primer.green[6], + "editorBracketHighlight.foreground5": primer.yellow[6], + "editorBracketHighlight.foreground6": primer.red[6], "gitDecoration.addedResourceForeground": primer.green[5], "gitDecoration.modifiedResourceForeground": primer.blue[6], From 63fced14ce924292a6ca32947da69b40ef0d7c5f Mon Sep 17 00:00:00 2001 From: yamatsum Date: Fri, 3 Sep 2021 16:38:01 +0900 Subject: [PATCH 02/11] fix: add terminalCursor. --- src/classic/theme.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/classic/theme.js b/src/classic/theme.js index 2c31521..ffe88f2 100644 --- a/src/classic/theme.js +++ b/src/classic/theme.js @@ -196,6 +196,8 @@ function getTheme({ style, name }) { "terminal.ansiBrightMagenta": primer.purple[6], "terminal.ansiBrightCyan": "#9ecbff", "terminal.ansiBrightWhite": primer.white, + "terminalCursor.background": primer.gray[3], + "terminalCursor.foreground": primer.blue[6], "editorBracketHighlight.foreground1": primer.blue[6], "editorBracketHighlight.foreground2": primer.purple[6], From 60402d9d7dbb9fb24669d6be563ffd709bb4d022 Mon Sep 17 00:00:00 2001 From: yamatsum Date: Fri, 3 Sep 2021 16:41:55 +0900 Subject: [PATCH 03/11] fix: editorBracketHighlight. --- src/classic/theme.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/classic/theme.js b/src/classic/theme.js index ffe88f2..3470399 100644 --- a/src/classic/theme.js +++ b/src/classic/theme.js @@ -200,11 +200,11 @@ function getTheme({ style, name }) { "terminalCursor.foreground": primer.blue[6], "editorBracketHighlight.foreground1": primer.blue[6], - "editorBracketHighlight.foreground2": primer.purple[6], - "editorBracketHighlight.foreground3": primer.orange[6], - "editorBracketHighlight.foreground4": primer.green[6], - "editorBracketHighlight.foreground5": primer.yellow[6], - "editorBracketHighlight.foreground6": primer.red[6], + "editorBracketHighlight.foreground2": primer.orange[6], + "editorBracketHighlight.foreground3": primer.purple[6], + "editorBracketHighlight.foreground4": primer.blue[6], + "editorBracketHighlight.foreground5": primer.orange[6], + "editorBracketHighlight.foreground6": primer.purple[6], "gitDecoration.addedResourceForeground": primer.green[5], "gitDecoration.modifiedResourceForeground": primer.blue[6], From 57315b5bf5dc52bbc2684d7f5d788145b39e562e Mon Sep 17 00:00:00 2001 From: yamatsum Date: Fri, 3 Sep 2021 22:25:23 +0900 Subject: [PATCH 04/11] fix: remove background. --- src/classic/theme.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/classic/theme.js b/src/classic/theme.js index 3470399..477bc55 100644 --- a/src/classic/theme.js +++ b/src/classic/theme.js @@ -178,7 +178,6 @@ function getTheme({ style, name }) { "panelInput.border": pick({ light: primer.gray[2], dark: primer.gray[1] }), "terminal.foreground": primer.gray[6], - "terminal.background": primer.gray[0], "terminal.tab.activeBorder": "#f9826c", "terminal.ansiBlack": primer.gray[3], "terminal.ansiRed": primer.red[6], From 317dbbfec1028514a3ca5f9fbdade0b5cba23fea Mon Sep 17 00:00:00 2001 From: yamatsum Date: Tue, 7 Sep 2021 21:08:27 +0900 Subject: [PATCH 05/11] fix: some colors in classic. --- src/classic/theme.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/classic/theme.js b/src/classic/theme.js index 477bc55..cfb2bb5 100644 --- a/src/classic/theme.js +++ b/src/classic/theme.js @@ -178,23 +178,24 @@ function getTheme({ style, name }) { "panelInput.border": pick({ light: primer.gray[2], dark: primer.gray[1] }), "terminal.foreground": primer.gray[6], + "terminal.background": pick({ light: primer.white, dark: primer.gray[0] }), "terminal.tab.activeBorder": "#f9826c", "terminal.ansiBlack": primer.gray[3], + "terminal.ansiWhite": pick({ light: primer.gray[9], dark: primer.gray[7] }), "terminal.ansiRed": primer.red[6], "terminal.ansiGreen": primer.green[6], "terminal.ansiYellow": primer.yellow[6], "terminal.ansiBlue": primer.blue[6], "terminal.ansiMagenta": primer.purple[6], "terminal.ansiCyan": "#9ecbff", - "terminal.ansiWhite": primer.white, "terminal.ansiBrightBlack": primer.gray[3], + "terminal.ansiBrightWhite": pick({ light: primer.gray[9], dark: primer.gray[7] }), "terminal.ansiBrightRed": primer.red[6], "terminal.ansiBrightGreen": primer.green[6], "terminal.ansiBrightYellow": primer.yellow[6], "terminal.ansiBrightBlue": primer.blue[6], "terminal.ansiBrightMagenta": primer.purple[6], "terminal.ansiBrightCyan": "#9ecbff", - "terminal.ansiBrightWhite": primer.white, "terminalCursor.background": primer.gray[3], "terminalCursor.foreground": primer.blue[6], From f1347e0e271b83afca4742b0c0a11ad537ac23ef Mon Sep 17 00:00:00 2001 From: yamatsum Date: Tue, 7 Sep 2021 21:21:52 +0900 Subject: [PATCH 06/11] fix: add editorError and editorWarning to classic. --- src/classic/theme.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/classic/theme.js b/src/classic/theme.js index cfb2bb5..82355e3 100644 --- a/src/classic/theme.js +++ b/src/classic/theme.js @@ -142,6 +142,8 @@ function getTheme({ style, name }) { "editorIndentGuide.activeBackground": pick({ light: "#d7dbe0", dark: primer.gray[2] }), "editorWhitespace.foreground": pick({ light: primer.gray[3], dark: primer.gray[2] }), "editorCursor.foreground": primer.blue[7], + "editorError.foreground": primer.red[6], + "editorWarning.foreground": primer.yellow[6], "editor.findMatchBackground": pick({ light: primer.yellow[4], dark: "#ffd33d44" }), "editor.findMatchHighlightBackground": pick({ light: "#ffdf5d66", dark: "#ffd33d22" }), From c465bdece9dc6195f2eb76ddd70c3c48d5f8b012 Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 8 Sep 2021 08:58:24 +0900 Subject: [PATCH 07/11] Remove `terminal.background` So that it matches the header/toolbar. --- src/classic/theme.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/classic/theme.js b/src/classic/theme.js index 82355e3..acc4442 100644 --- a/src/classic/theme.js +++ b/src/classic/theme.js @@ -180,7 +180,6 @@ function getTheme({ style, name }) { "panelInput.border": pick({ light: primer.gray[2], dark: primer.gray[1] }), "terminal.foreground": primer.gray[6], - "terminal.background": pick({ light: primer.white, dark: primer.gray[0] }), "terminal.tab.activeBorder": "#f9826c", "terminal.ansiBlack": primer.gray[3], "terminal.ansiWhite": pick({ light: primer.gray[9], dark: primer.gray[7] }), From ac15f468d4308cdfb07ab196417bff4eb33875f5 Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 8 Sep 2021 09:04:53 +0900 Subject: [PATCH 08/11] Update ansi in dark --- src/classic/theme.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/classic/theme.js b/src/classic/theme.js index acc4442..8dd7a9b 100644 --- a/src/classic/theme.js +++ b/src/classic/theme.js @@ -181,16 +181,16 @@ function getTheme({ style, name }) { "terminal.foreground": primer.gray[6], "terminal.tab.activeBorder": "#f9826c", - "terminal.ansiBlack": primer.gray[3], - "terminal.ansiWhite": pick({ light: primer.gray[9], dark: primer.gray[7] }), + "terminal.ansiBlack": primer.gray[3], // BLACK + "terminal.ansiWhite": pick({ light: primer.gray[9], dark: primer.gray[6] }), // LIGHT_GRAY "terminal.ansiRed": primer.red[6], "terminal.ansiGreen": primer.green[6], "terminal.ansiYellow": primer.yellow[6], "terminal.ansiBlue": primer.blue[6], "terminal.ansiMagenta": primer.purple[6], "terminal.ansiCyan": "#9ecbff", - "terminal.ansiBrightBlack": primer.gray[3], - "terminal.ansiBrightWhite": pick({ light: primer.gray[9], dark: primer.gray[7] }), + "terminal.ansiBrightBlack": primer.gray[5], // GRAY + "terminal.ansiBrightWhite": pick({ light: primer.gray[9], dark: primer.gray[9] }), // WHITE "terminal.ansiBrightRed": primer.red[6], "terminal.ansiBrightGreen": primer.green[6], "terminal.ansiBrightYellow": primer.yellow[6], From 33ae5fb42ef0bfb6b96564b9ee347e7e5b2692bb Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 8 Sep 2021 10:03:59 +0900 Subject: [PATCH 09/11] Update ansi in light --- src/classic/theme.js | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/src/classic/theme.js b/src/classic/theme.js index 8dd7a9b..8c32833 100644 --- a/src/classic/theme.js +++ b/src/classic/theme.js @@ -181,25 +181,36 @@ function getTheme({ style, name }) { "terminal.foreground": primer.gray[6], "terminal.tab.activeBorder": "#f9826c", - "terminal.ansiBlack": primer.gray[3], // BLACK - "terminal.ansiWhite": pick({ light: primer.gray[9], dark: primer.gray[6] }), // LIGHT_GRAY - "terminal.ansiRed": primer.red[6], - "terminal.ansiGreen": primer.green[6], - "terminal.ansiYellow": primer.yellow[6], - "terminal.ansiBlue": primer.blue[6], - "terminal.ansiMagenta": primer.purple[6], - "terminal.ansiCyan": "#9ecbff", - "terminal.ansiBrightBlack": primer.gray[5], // GRAY - "terminal.ansiBrightWhite": pick({ light: primer.gray[9], dark: primer.gray[9] }), // WHITE - "terminal.ansiBrightRed": primer.red[6], - "terminal.ansiBrightGreen": primer.green[6], - "terminal.ansiBrightYellow": primer.yellow[6], - "terminal.ansiBrightBlue": primer.blue[6], - "terminal.ansiBrightMagenta": primer.purple[6], - "terminal.ansiBrightCyan": "#9ecbff", "terminalCursor.background": primer.gray[3], "terminalCursor.foreground": primer.blue[6], + // Test ANSI colors with: + // echo -e "\033[0mNC (No color)" + // echo -e "\033[1;37mWHITE\t\033[0;30mBLACK" + // echo -e "\033[0;34mBLUE\t\033[1;34mLIGHT_BLUE" + // echo -e "\033[0;32mGREEN\t\033[1;32mLIGHT_GREEN" + // echo -e "\033[0;36mCYAN\t\033[1;36mLIGHT_CYAN" + // echo -e "\033[0;31mRED\t\033[1;31mLIGHT_RED" + // echo -e "\033[0;35mPURPLE\t\033[1;35mLIGHT_PURPLE" + // echo -e "\033[0;33mYELLOW\t\033[1;33mLIGHT_YELLOW" + // echo -e "\033[1;30mGRAY\t\033[0;37mLIGHT_GRAY" + "terminal.ansiBrightWhite": pick({ light: primer.gray[3], dark: primer.gray[9] }), // WHITE + "terminal.ansiWhite": pick({ light: primer.gray[5], dark: primer.gray[6] }), // LIGHT_GRAY + "terminal.ansiBrightBlack": pick({ light: primer.gray[4], dark: primer.gray[5] }), // GRAY + "terminal.ansiBlack": pick({ light: primer.gray[9], dark: primer.gray[3] }), // BLACK + "terminal.ansiBlue": primer.blue[5], + "terminal.ansiBrightBlue": primer.blue[6], + "terminal.ansiGreen": primer.green[5], + "terminal.ansiBrightGreen": primer.green[6], + "terminal.ansiCyan": pick({ light: "#1b7c83", dark: "#39c5cf" }), + "terminal.ansiBrightCyan": pick({ light: "#3192aa", dark: "#56d4dd" }), + "terminal.ansiRed": primer.red[5], + "terminal.ansiBrightRed": primer.red[6], + "terminal.ansiMagenta": primer.purple[6], + "terminal.ansiBrightMagenta": primer.purple[6], + "terminal.ansiYellow": pick({ light: primer.yellow[7], dark: primer.yellow[6] }), + "terminal.ansiBrightYellow": pick({ light: primer.yellow[8], dark: primer.yellow[6] }), + "editorBracketHighlight.foreground1": primer.blue[6], "editorBracketHighlight.foreground2": primer.orange[6], "editorBracketHighlight.foreground3": primer.purple[6], From 8aff7fb63b477a1fca5dfb6e686a708654627e5c Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 8 Sep 2021 10:19:29 +0900 Subject: [PATCH 10/11] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 668a619..e499a38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 4.2.0 + +- Add `editorBracketHighlight` and ANSI to classic. [#205](https://github.com/primer/github-vscode-theme/pull/205). +- Set `terminal.tab.activeBorder` based on editor tab [#189](https://github.com/primer/github-vscode-theme/pull/189). +- More clearer for the difference between new theme and legacy theme [#191](https://github.com/primer/github-vscode-theme/pull/191). + ## 4.1.1 - Generate themes based on `4.1.0`. From fb87b53f7ed0e67ca871e55d6fad474a06e9d969 Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 8 Sep 2021 10:20:02 +0900 Subject: [PATCH 11/11] 4.2.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 488e0cd..0d9b3cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "github-vscode-theme", - "version": "4.1.1", + "version": "4.2.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index c92a84a..3b83736 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "github-vscode-theme", "displayName": "GitHub Theme", "description": "GitHub theme for VS Code", - "version": "4.1.1", + "version": "4.2.0", "preview": true, "publisher": "GitHub", "license": "MIT",