Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quick improvements to #65 #68

Merged
merged 3 commits into from
Jun 26, 2020
Merged

Quick improvements to #65 #68

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfad9f4
Maintainability improvements
icebeam030 Jun 26, 2020
c17ec10
Merge remote-tracking branch 'upstream/master'
icebeam030 Jun 26, 2020
3229c64
Stick naming to VSCode standard
icebeam030 Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
51 changes: 26 additions & 25 deletions src/theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ function getTheme({ style, name }) {

const primer = getColors(style);

const foreground = pick({ light: primer.gray[8], dark: primer.gray[7] });
const workbenchForeground = pick({ light: primer.gray[8], dark: primer.gray[7] });
const editorForeground = pick({ light: primer.gray[9], dark: primer.gray[7] });

return {
name: name,
Expand All @@ -37,26 +38,26 @@ function getTheme({ style, name }) {

"dropdown.background": pick({ light: primer.gray[0], dark: primer.gray[1] }),
"dropdown.border": pick({ light: primer.gray[2], dark: primer.white }),
"dropdown.foreground": foreground,
"dropdown.foreground": workbenchForeground,
"dropdown.listBackground": pick({ light: primer.white, dark: primer.gray[0] }),

"input.background": pick({ light: primer.gray[0], dark: primer.gray[1] }),
"input.border": pick({ light: primer.gray[2], dark: primer.white }),
"input.foreground": foreground,
"input.foreground": workbenchForeground,
"input.placeholderForeground": pick({ light: primer.gray[4], dark: primer.gray[5] }),

"badge.foreground": pick({ light: primer.blue[6], dark: primer.blue[7] }),
"badge.background": pick({ light: primer.blue[1], dark: primer.blue[2] }),

"progressBar.background": primer.blue[4],

"titleBar.activeForeground": foreground,
"titleBar.activeForeground": workbenchForeground,
"titleBar.activeBackground": pick({ light: primer.white, dark: primer.gray[0] }),
"titleBar.inactiveForeground": primer.gray[5],
"titleBar.inactiveBackground": pick({ light: primer.gray[1], dark: "#1f2428" }),
"titleBar.border": pick({ light: primer.gray[2], dark: primer.white }),

"activityBar.foreground": foreground,
"activityBar.foreground": workbenchForeground,
"activityBar.inactiveForeground": primer.gray[4],
"activityBar.background": pick({ light: primer.white, dark: primer.gray[0] }),
"activityBarBadge.foreground": pick({ light: primer.white, dark: primer.black }),
Expand All @@ -67,14 +68,14 @@ function getTheme({ style, name }) {
"sideBar.foreground": primer.gray[6],
"sideBar.background": pick({ light: primer.gray[1], dark: "#1f2428" }),
"sideBar.border": pick({ light: primer.gray[2], dark: primer.white }),
"sideBarTitle.foreground": foreground,
"sideBarSectionHeader.foreground": foreground,
"sideBarTitle.foreground": workbenchForeground,
"sideBarSectionHeader.foreground": workbenchForeground,
"sideBarSectionHeader.background": pick({ light: primer.gray[1], dark: "#1f2428" }),
"sideBarSectionHeader.border": pick({ light: primer.gray[2], dark: primer.white }),

"list.hoverForeground": foreground,
"list.inactiveSelectionForeground": foreground,
"list.activeSelectionForeground": foreground,
"list.hoverForeground": workbenchForeground,
"list.inactiveSelectionForeground": workbenchForeground,
"list.activeSelectionForeground": workbenchForeground,
"list.hoverBackground": pick({ light: "#ebf0f4", dark: "#282e34" }),
"list.inactiveSelectionBackground": pick({ light: "#e8eaed", dark: "#282e34" }),
"list.activeSelectionBackground": pick({ light: "#e2e5e9", dark: "#39414a" }),
Expand All @@ -85,17 +86,17 @@ function getTheme({ style, name }) {

"notificationCenterHeader.foreground": primer.gray[5],
"notificationCenterHeader.background": pick({ light: primer.gray[2], dark: primer.gray[0] }),
"notifications.foreground": foreground,
"notifications.foreground": workbenchForeground,
"notifications.background": pick({ light: primer.gray[0], dark: primer.gray[1] }),
"notifications.border": pick({ light: primer.gray[2], dark: primer.white }),
"notificationsErrorIcon.foreground": primer.red[5],
"notificationsWarningIcon.foreground": primer.orange[6],
"notificationsInfoIcon.foreground": primer.blue[6],

"pickerGroup.border": primer.gray[2],
"pickerGroup.foreground": foreground,
"pickerGroup.foreground": workbenchForeground,
"quickInput.background": primer.gray[0],
"quickInput.foreground": foreground,
"quickInput.foreground": workbenchForeground,

"statusBar.foreground": primer.gray[6],
"statusBar.background": pick({ light: primer.white, dark: primer.gray[0] }),
Expand All @@ -108,7 +109,7 @@ function getTheme({ style, name }) {
"editorGroupHeader.tabsBorder": pick({ light: primer.gray[2], dark: primer.white }),
"editorGroup.border": pick({ light: primer.gray[2], dark: primer.white }),

"tab.activeForeground": foreground,
"tab.activeForeground": workbenchForeground,
"tab.inactiveForeground": primer.gray[5],
"tab.inactiveBackground": pick({ light: primer.gray[1], dark: "#1f2428" }),
"tab.activeBackground": pick({ light: primer.white, dark: primer.gray[0] }),
Expand All @@ -121,17 +122,17 @@ function getTheme({ style, name }) {
"tab.activeBorderTop": "#f9826c",

"breadcrumb.foreground": primer.gray[5],
"breadcrumb.focusForeground": foreground,
"breadcrumb.focusForeground": workbenchForeground,
"breadcrumb.activeSelectionForeground": primer.gray[6],
"breadcrumbPicker.background": pick({ light: primer.gray[0], dark: "#2b3036" }),

"editor.foreground": pick({ light: primer.gray[9], dark: primer.gray[7] }),
"editor.foreground": editorForeground,
"editor.background": pick({ light: primer.white, dark: primer.gray[0] }),
"editorWidget.background": pick({ light: primer.gray[1], dark: "#1f2428" }),
"editor.foldBackground": pick({ light: primer.gray[0], dark: "#282e33" }),
"editor.lineHighlightBackground": pick({ light: primer.gray[1], dark: "#2b3036" }),
"editorLineNumber.foreground": pick({ light: "#1b1f234d", dark: primer.gray[2] }),
"editorLineNumber.activeForeground": pick({ light: primer.gray[9], dark: primer.gray[7] }),
"editorLineNumber.activeForeground": editorForeground,
"editorIndentGuide.background": pick({ light: "#eff2f6", dark: primer.gray[1] }),
"editorIndentGuide.activeBackground": pick({ light: "#d7dbe0", dark: primer.gray[2] }),
"editorWhitespace.foreground": pick({ light: primer.gray[3], dark: primer.gray[2] }),
Expand Down Expand Up @@ -166,7 +167,7 @@ function getTheme({ style, name }) {
"panel.background": pick({ light: primer.gray[1], dark: "#1f2428" }),
"panel.border": pick({ light: primer.gray[2], dark: primer.white }),
"panelTitle.activeBorder": "#f9826c",
"panelTitle.activeForeground": foreground,
"panelTitle.activeForeground": workbenchForeground,
"panelTitle.inactiveForeground": primer.gray[5],
"panelInput.border": pick({ light: primer.gray[2], dark: primer.gray[1] }),

Expand All @@ -189,7 +190,7 @@ function getTheme({ style, name }) {
"peekViewEditor.background": pick({ dark: "#1f242888" }),
"peekViewResult.background": pick({ dark: "#1f2428" }),

"settings.headerForeground": foreground,
"settings.headerForeground": workbenchForeground,
"settings.modifiedItemIndicator": primer.blue[4],
"welcomePage.buttonBackground": primer.gray[1],
"welcomePage.buttonHoverBackground": primer.gray[2],
Expand Down Expand Up @@ -222,7 +223,7 @@ function getTheme({ style, name }) {
{
scope: "variable.parameter.function",
settings: {
foreground: pick({ light: primer.gray[9], dark: primer.gray[7] }),
foreground: editorForeground,
},
},
{
Expand Down Expand Up @@ -250,7 +251,7 @@ function getTheme({ style, name }) {
"storage.type.java",
],
settings: {
foreground: pick({ light: primer.gray[9], dark: primer.gray[7] }),
foreground: editorForeground,
},
},
{
Expand Down Expand Up @@ -284,7 +285,7 @@ function getTheme({ style, name }) {
{
scope: "variable.other",
settings: {
foreground: pick({ light: primer.gray[9], dark: primer.gray[7] }),
foreground: editorForeground,
},
},
{
Expand Down Expand Up @@ -333,7 +334,7 @@ function getTheme({ style, name }) {
{
scope: "string source",
settings: {
foreground: pick({ light: primer.gray[9], dark: primer.gray[7] }),
foreground: editorForeground,
},
},
{
Expand Down Expand Up @@ -407,14 +408,14 @@ function getTheme({ style, name }) {
scope: "markup.italic",
settings: {
fontStyle: "italic",
foreground: pick({ light: primer.gray[9], dark: primer.gray[7] }),
foreground: editorForeground,
},
},
{
scope: "markup.bold",
settings: {
fontStyle: "bold",
foreground: pick({ light: primer.gray[9], dark: primer.gray[7] }),
foreground: editorForeground,
},
},
{
Expand Down