Skip to content

Commit

Permalink
feat: change theme color; color more liquid
Browse files Browse the repository at this point in the history
  • Loading branch information
@wiidede
wiidede committed Oct 31, 2022
1 parent 62ad771 commit c6f1132
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 46 deletions.
3 changes: 2 additions & 1 deletion src/colors.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const colors = {

// [dark, light]
export const ThemesColors = {
primary: ['#00AFDB', '#00AFDB'],
primary: ['#775FC0', '#856ACE'],

foreground: ['#ACA79F', '#393a34'],
activeForeground: ['#BCB7B2', '#4e4f47'],
Expand Down Expand Up @@ -57,6 +57,7 @@ export const ThemesColors = {
orange: ['#FFAA4D', '#FFAA52'],
yellow: ['#FFE900', '#FFE916'],
magenta: ['#EA27C2', '#E838BF'],
purple: ['#775FC0', '#856ACE'],

colorful: ['#775FC0', '#71D34C', '#FBEA4E', '#F3AE5F', '#EE7A7A', '#EB50B1', '#52B498', '#4498C9'],
}
30 changes: 15 additions & 15 deletions src/theme.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default function getTheme({ style, name, soft = false, black = false }) {
'sideBarSectionHeader.border': border,

'list.hoverForeground': activeForeground,
'list.inactiveSelectionForeground': activeForeground,
'list.inactiveSelectionForeground': primary,
'list.activeSelectionForeground': primary,
'list.hoverBackground': hoverBackground,
'list.inactiveSelectionBackground': activeBackground,
Expand Down Expand Up @@ -129,7 +129,7 @@ export default function getTheme({ style, name, soft = false, black = false }) {
'editorGroupHeader.tabsBorder': border,
'editorGroup.border': border,

'tab.activeForeground': activeForeground,
'tab.activeForeground': primary,
'tab.inactiveForeground': primer.gray[5],
'tab.inactiveBackground': background,
'tab.activeBackground': activeBackground,
Expand Down Expand Up @@ -157,17 +157,17 @@ export default function getTheme({ style, name, soft = false, black = false }) {
'editorWhitespace.foreground': pick({ light: '#00000015', dark: '#ffffff15' }),
'editorCursor.foreground': primary,

'editor.findMatchBackground': pick({ light: '#e6cc7744', dark: '#e6cc7722' }),
'editor.findMatchHighlightBackground': pick({ light: '#e6cc7766', dark: '#e6cc7744' }),
'editor.findMatchBackground': `${primary}80`, // pick({ light: '#e6cc7744', dark: '#e6cc7722' }),
'editor.findMatchHighlightBackground': `${primary}60`, // pick({ light: '#e6cc7766', dark: '#e6cc7744' }),
'editor.inactiveSelectionBackground': selectionBackgroundInActive,
'editor.selectionBackground': selectionBackground,
'editor.selectionHighlightBackground': selectionBackgroundInActive,
'editor.wordHighlightBackground': pick({ light: '#1c6b4805', dark: '#1c6b4805' }),
'editor.wordHighlightStrongBackground': pick({ light: '#1c6b4810', dark: '#1c6b4810' }),
'editorBracketMatch.background': pick({ light: '#1c6b4820', dark: '#4d937520' }),
'editor.wordHighlightBackground': `${primary}30`, // pick({ light: '#1c6b4805', dark: '#1c6b4805' }),
'editor.wordHighlightStrongBackground': `${primary}30`, // pick({ light: '#1c6b4810', dark: '#1c6b4810' }),
// 'editorBracketMatch.background': pick({ light: '#1c6b4820', dark: '#4d937520' }),

'diffEditor.insertedTextBackground': pick({ light: '#1c6b4815', dark: '#4d937522' }),
'diffEditor.removedTextBackground': pick({ light: '#ab595910', dark: '#ab595922' }),
'diffEditor.insertedTextBackground': `${themeColor('green')}40`, // pick({ light: '#1c6b4815', dark: '#4d937522' }),
'diffEditor.removedTextBackground': `${themeColor('red')}40`, // pick({ light: '#ab595910', dark: '#ab595922' }),

'scrollbar.shadow': themeColor('background'),
'scrollbarSlider.background': themeColor('faded'),
Expand All @@ -178,7 +178,7 @@ export default function getTheme({ style, name, soft = false, black = false }) {
'panel.background': background,
'panel.border': border,
'panelTitle.activeBorder': border,
'panelTitle.activeForeground': activeForeground,
'panelTitle.activeForeground': primary,
'panelTitle.inactiveForeground': primer.gray[5],
'panelInput.border': pick({ light: primer.gray[2], dark: primer.gray[1] }),

Expand Down Expand Up @@ -209,7 +209,7 @@ export default function getTheme({ style, name, soft = false, black = false }) {
'gitDecoration.conflictingResourceForeground': themeColor('orange'),
'gitDecoration.submoduleResourceForeground': themeColor('secondaryForeground'),

'editorGutter.modifiedBackground': themeColor('blue'),
'editorGutter.modifiedBackground': themeColor('purple'),
'editorGutter.addedBackground': themeColor('green'),
'editorGutter.deletedBackground': themeColor('red'),

Expand All @@ -223,11 +223,11 @@ export default function getTheme({ style, name, soft = false, black = false }) {
'editorBracketHighlight.foreground8': ThemesColors.colorful[7],

'debugToolBar.background': background,
'editor.stackFrameHighlightBackground': pick({ light: primer.yellow[1], dark: '#a707' }),
'editor.focusedStackFrameHighlightBackground': pick({ light: primer.yellow[2], dark: '#b808' }),
'editor.stackFrameHighlightBackground': `${primary}80`, // pick({ light: primer.yellow[1], dark: '#a707' }),
'editor.focusedStackFrameHighlightBackground': `${primary}80`, // pick({ light: primer.yellow[2], dark: '#b808' }),

'peekViewEditor.matchHighlightBackground': pick({ dark: '#ffd33d33' }),
'peekViewResult.matchHighlightBackground': pick({ dark: '#ffd33d33' }),
'peekViewEditor.matchHighlightBackground': `${primary}80`,
'peekViewResult.matchHighlightBackground': `${primary}80`,
'peekViewEditor.background': background,
'peekViewResult.background': background,

Expand Down
59 changes: 29 additions & 30 deletions themes/liquid-ray-theme.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
"foreground": "#ACA79F",
"descriptionForeground": "#E4E2DC80",
"errorForeground": "#FF7276",
"textLink.foreground": "#00AFDB",
"textLink.activeForeground": "#00AFDB",
"textLink.foreground": "#775FC0",
"textLink.activeForeground": "#775FC0",
"textBlockQuote.background": "#252526",
"textBlockQuote.border": "#252526",
"textCodeBlock.background": "#252526",
"textPreformat.foreground": "#dadad1",
"textSeparator.foreground": "#696958",
"button.background": "#00AFDB",
"button.background": "#775FC0",
"button.foreground": "#252526",
"button.hoverBackground": "#00AFDB",
"button.hoverBackground": "#775FC0",
"checkbox.background": "#202021",
"checkbox.border": "#3d2f2f",
"dropdown.background": "#252526",
Expand All @@ -29,7 +29,7 @@
"inputOption.activeBackground": "#E4E2DC30",
"badge.foreground": "#252526",
"badge.background": "#E4E2DC80",
"progressBar.background": "#00AFDB",
"progressBar.background": "#775FC0",
"titleBar.activeForeground": "#BCB7B2",
"titleBar.activeBackground": "#252526",
"titleBar.inactiveForeground": "#a5a595",
Expand All @@ -50,8 +50,8 @@
"sideBarSectionHeader.background": "#252526",
"sideBarSectionHeader.border": "#252526",
"list.hoverForeground": "#BCB7B2",
"list.inactiveSelectionForeground": "#BCB7B2",
"list.activeSelectionForeground": "#00AFDB",
"list.inactiveSelectionForeground": "#775FC0",
"list.activeSelectionForeground": "#775FC0",
"list.hoverBackground": "#29292A",
"list.inactiveSelectionBackground": "#202021",
"list.activeSelectionBackground": "#202021",
Expand Down Expand Up @@ -80,7 +80,7 @@
"editorGroupHeader.tabsBackground": "#252526",
"editorGroupHeader.tabsBorder": "#252526",
"editorGroup.border": "#252526",
"tab.activeForeground": "#BCB7B2",
"tab.activeForeground": "#775FC0",
"tab.inactiveForeground": "#a5a595",
"tab.inactiveBackground": "#252526",
"tab.activeBackground": "#202021",
Expand All @@ -104,17 +104,16 @@
"editorIndentGuide.background": "#ffffff15",
"editorIndentGuide.activeBackground": "#ffffff30",
"editorWhitespace.foreground": "#ffffff15",
"editorCursor.foreground": "#00AFDB",
"editor.findMatchBackground": "#e6cc7722",
"editor.findMatchHighlightBackground": "#e6cc7744",
"editorCursor.foreground": "#775FC0",
"editor.findMatchBackground": "#775FC080",
"editor.findMatchHighlightBackground": "#775FC060",
"editor.inactiveSelectionBackground": "#eeeeee08",
"editor.selectionBackground": "#eeeeee15",
"editor.selectionHighlightBackground": "#eeeeee08",
"editor.wordHighlightBackground": "#1c6b4805",
"editor.wordHighlightStrongBackground": "#1c6b4810",
"editorBracketMatch.background": "#4d937520",
"diffEditor.insertedTextBackground": "#4d937522",
"diffEditor.removedTextBackground": "#ab595922",
"editor.wordHighlightBackground": "#775FC030",
"editor.wordHighlightStrongBackground": "#775FC030",
"diffEditor.insertedTextBackground": "#44D62C40",
"diffEditor.removedTextBackground": "#FF727640",
"scrollbar.shadow": "#252526",
"scrollbarSlider.background": "#E4E2DC10",
"scrollbarSlider.hoverBackground": "#E4E2DC30",
Expand All @@ -123,7 +122,7 @@
"panel.background": "#252526",
"panel.border": "#252526",
"panelTitle.activeBorder": "#252526",
"panelTitle.activeForeground": "#BCB7B2",
"panelTitle.activeForeground": "#775FC0",
"panelTitle.inactiveForeground": "#a5a595",
"panelInput.border": "#3d2f2f",
"terminal.foreground": "#ACA79F",
Expand Down Expand Up @@ -151,7 +150,7 @@
"gitDecoration.ignoredResourceForeground": "#E4E2DC30",
"gitDecoration.conflictingResourceForeground": "#FFAA4D",
"gitDecoration.submoduleResourceForeground": "#E4E2DC80",
"editorGutter.modifiedBackground": "#009ACE",
"editorGutter.modifiedBackground": "#775FC0",
"editorGutter.addedBackground": "#44D62C",
"editorGutter.deletedBackground": "#FF7276",
"editorBracketHighlight.foreground1": "#775FC0",
Expand All @@ -163,14 +162,14 @@
"editorBracketHighlight.foreground7": "#52B498",
"editorBracketHighlight.foreground8": "#4498C9",
"debugToolBar.background": "#252526",
"editor.stackFrameHighlightBackground": "#a707",
"editor.focusedStackFrameHighlightBackground": "#b808",
"peekViewEditor.matchHighlightBackground": "#ffd33d33",
"peekViewResult.matchHighlightBackground": "#ffd33d33",
"editor.stackFrameHighlightBackground": "#775FC080",
"editor.focusedStackFrameHighlightBackground": "#775FC080",
"peekViewEditor.matchHighlightBackground": "#775FC080",
"peekViewResult.matchHighlightBackground": "#775FC080",
"peekViewEditor.background": "#252526",
"peekViewResult.background": "#252526",
"settings.headerForeground": "#ACA79F",
"settings.modifiedItemIndicator": "#00AFDB",
"settings.modifiedItemIndicator": "#775FC0",
"welcomePage.buttonBackground": "#3d2f2f",
"welcomePage.buttonHoverBackground": "#564444",
"problemsErrorIcon.foreground": "#FF7276",
Expand Down Expand Up @@ -496,7 +495,7 @@
{
"scope": "meta.module-reference",
"settings": {
"foreground": "#00AFDB"
"foreground": "#775FC0"
}
},
{
Expand All @@ -512,7 +511,7 @@
],
"settings": {
"fontStyle": "bold",
"foreground": "#00AFDB"
"foreground": "#775FC0"
}
},
{
Expand All @@ -538,7 +537,7 @@
{
"scope": "markup.raw",
"settings": {
"foreground": "#00AFDB"
"foreground": "#775FC0"
}
},
{
Expand Down Expand Up @@ -996,19 +995,19 @@
},
{
"token": "meta.module-reference",
"foreground": "00AFDB"
"foreground": "775FC0"
},
{
"token": "punctuation.definition.list.begin.markdown",
"foreground": "FFAA4D"
},
{
"token": "markup.heading",
"foreground": "00AFDB"
"foreground": "775FC0"
},
{
"token": "markup.heading entity.name",
"foreground": "00AFDB"
"foreground": "775FC0"
},
{
"token": "markup.quote",
Expand All @@ -1024,7 +1023,7 @@
},
{
"token": "markup.raw",
"foreground": "00AFDB"
"foreground": "775FC0"
},
{
"token": "markup.deleted",
Expand Down

0 comments on commit c6f1132

Please sign in to comment.