Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Unify terminal colours
  • Loading branch information
Ike Ku committed Nov 12, 2018
1 parent 97f8048 commit 3042d73
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 87 deletions.
17 changes: 8 additions & 9 deletions ayu-dark-bordered.json
Expand Up @@ -161,24 +161,23 @@
"gitDecoration.submoduleResourceForeground": "#ffee99b3",
"settings.headerForeground": "#b3b1ad",
"settings.modifiedItemIndicator": "#6994bf",
"settings.checkboxForeground": "#ffee99",
"terminal.background": "#0a0e14",
"terminal.foreground": "#b3b1ad",
"terminal.ansiBlack": "#01060e",
"terminal.ansiRed": "#f07178",
"terminal.ansiRed": "#ea6c73",
"terminal.ansiGreen": "#91b362",
"terminal.ansiYellow": "#ffb454",
"terminal.ansiYellow": "#f9af4f",
"terminal.ansiBlue": "#53bdfa",
"terminal.ansiMagenta": "#ca30c7",
"terminal.ansiCyan": "#95e6cb",
"terminal.ansiMagenta": "#fae994",
"terminal.ansiCyan": "#90e1c6",
"terminal.ansiWhite": "#c7c7c7",
"terminal.ansiBrightBlack": "#686868",
"terminal.ansiBrightRed": "#e6b673",
"terminal.ansiBrightRed": "#f07178",
"terminal.ansiBrightGreen": "#c2d94c",
"terminal.ansiBrightYellow": "#ffee99",
"terminal.ansiBrightYellow": "#ffb454",
"terminal.ansiBrightBlue": "#59c2ff",
"terminal.ansiBrightMagenta": "#ff77ff",
"terminal.ansiBrightCyan": "#a6fde1",
"terminal.ansiBrightMagenta": "#ffee99",
"terminal.ansiBrightCyan": "#95e6cb",
"terminal.ansiBrightWhite": "#ffffff"
},
"tokenColors": [
Expand Down
17 changes: 8 additions & 9 deletions ayu-dark.json
Expand Up @@ -161,24 +161,23 @@
"gitDecoration.submoduleResourceForeground": "#ffee99b3",
"settings.headerForeground": "#b3b1ad",
"settings.modifiedItemIndicator": "#6994bf",
"settings.checkboxForeground": "#ffee99",
"terminal.background": "#0a0e14",
"terminal.foreground": "#b3b1ad",
"terminal.ansiBlack": "#01060e",
"terminal.ansiRed": "#f07178",
"terminal.ansiRed": "#ea6c73",
"terminal.ansiGreen": "#91b362",
"terminal.ansiYellow": "#ffb454",
"terminal.ansiYellow": "#f9af4f",
"terminal.ansiBlue": "#53bdfa",
"terminal.ansiMagenta": "#ca30c7",
"terminal.ansiCyan": "#95e6cb",
"terminal.ansiMagenta": "#fae994",
"terminal.ansiCyan": "#90e1c6",
"terminal.ansiWhite": "#c7c7c7",
"terminal.ansiBrightBlack": "#686868",
"terminal.ansiBrightRed": "#e6b673",
"terminal.ansiBrightRed": "#f07178",
"terminal.ansiBrightGreen": "#c2d94c",
"terminal.ansiBrightYellow": "#ffee99",
"terminal.ansiBrightYellow": "#ffb454",
"terminal.ansiBrightBlue": "#59c2ff",
"terminal.ansiBrightMagenta": "#ff77ff",
"terminal.ansiBrightCyan": "#a6fde1",
"terminal.ansiBrightMagenta": "#ffee99",
"terminal.ansiBrightCyan": "#95e6cb",
"terminal.ansiBrightWhite": "#ffffff"
},
"tokenColors": [
Expand Down
15 changes: 7 additions & 8 deletions ayu-light-bordered.json
Expand Up @@ -161,24 +161,23 @@
"gitDecoration.submoduleResourceForeground": "#a37accb3",
"settings.headerForeground": "#6c7680",
"settings.modifiedItemIndicator": "#709ecc",
"settings.checkboxForeground": "#a37acc",
"terminal.background": "#fafafa",
"terminal.foreground": "#6c7680",
"terminal.ansiBlack": "#000000",
"terminal.ansiRed": "#f07171",
"terminal.ansiRed": "#ea6c6d",
"terminal.ansiGreen": "#99bf4d",
"terminal.ansiYellow": "#f2ae49",
"terminal.ansiYellow": "#eca944",
"terminal.ansiBlue": "#3199e1",
"terminal.ansiMagenta": "#9966cc",
"terminal.ansiCyan": "#4cbf99",
"terminal.ansiMagenta": "#9e75c7",
"terminal.ansiCyan": "#46ba94",
"terminal.ansiWhite": "#c7c7c7",
"terminal.ansiBrightBlack": "#686868",
"terminal.ansiBrightRed": "#d6656a",
"terminal.ansiBrightRed": "#f07171",
"terminal.ansiBrightGreen": "#86b300",
"terminal.ansiBrightYellow": "#ed9366",
"terminal.ansiBrightYellow": "#f2ae49",
"terminal.ansiBrightBlue": "#399ee6",
"terminal.ansiBrightMagenta": "#a37acc",
"terminal.ansiBrightCyan": "#57d9ad",
"terminal.ansiBrightCyan": "#4cbf99",
"terminal.ansiBrightWhite": "#ffffff"
},
"tokenColors": [
Expand Down
15 changes: 7 additions & 8 deletions ayu-light.json
Expand Up @@ -161,24 +161,23 @@
"gitDecoration.submoduleResourceForeground": "#a37accb3",
"settings.headerForeground": "#6c7680",
"settings.modifiedItemIndicator": "#709ecc",
"settings.checkboxForeground": "#a37acc",
"terminal.background": "#fafafa",
"terminal.foreground": "#6c7680",
"terminal.ansiBlack": "#000000",
"terminal.ansiRed": "#f07171",
"terminal.ansiRed": "#ea6c6d",
"terminal.ansiGreen": "#99bf4d",
"terminal.ansiYellow": "#f2ae49",
"terminal.ansiYellow": "#eca944",
"terminal.ansiBlue": "#3199e1",
"terminal.ansiMagenta": "#9966cc",
"terminal.ansiCyan": "#4cbf99",
"terminal.ansiMagenta": "#9e75c7",
"terminal.ansiCyan": "#46ba94",
"terminal.ansiWhite": "#c7c7c7",
"terminal.ansiBrightBlack": "#686868",
"terminal.ansiBrightRed": "#d6656a",
"terminal.ansiBrightRed": "#f07171",
"terminal.ansiBrightGreen": "#86b300",
"terminal.ansiBrightYellow": "#ed9366",
"terminal.ansiBrightYellow": "#f2ae49",
"terminal.ansiBrightBlue": "#399ee6",
"terminal.ansiBrightMagenta": "#a37acc",
"terminal.ansiBrightCyan": "#57d9ad",
"terminal.ansiBrightCyan": "#4cbf99",
"terminal.ansiBrightWhite": "#ffffff"
},
"tokenColors": [
Expand Down
17 changes: 8 additions & 9 deletions ayu-mirage-bordered.json
Expand Up @@ -161,24 +161,23 @@
"gitDecoration.submoduleResourceForeground": "#d4bfffb3",
"settings.headerForeground": "#cbccc6",
"settings.modifiedItemIndicator": "#77a8d9",
"settings.checkboxForeground": "#d4bfff",
"terminal.background": "#1f2430",
"terminal.foreground": "#cbccc6",
"terminal.ansiBlack": "#191e2a",
"terminal.ansiRed": "#f28779",
"terminal.ansiRed": "#ed8274",
"terminal.ansiGreen": "#a6cc70",
"terminal.ansiYellow": "#ffcc66",
"terminal.ansiYellow": "#fad07b",
"terminal.ansiBlue": "#6dcbfa",
"terminal.ansiMagenta": "#d4bfff",
"terminal.ansiCyan": "#95e6cb",
"terminal.ansiMagenta": "#cfbafa",
"terminal.ansiCyan": "#90e1c6",
"terminal.ansiWhite": "#c7c7c7",
"terminal.ansiBrightBlack": "#686868",
"terminal.ansiBrightRed": "#ffe6b3",
"terminal.ansiBrightRed": "#f28779",
"terminal.ansiBrightGreen": "#bae67e",
"terminal.ansiBrightYellow": "#ffdf80",
"terminal.ansiBrightYellow": "#ffd580",
"terminal.ansiBrightBlue": "#73d0ff",
"terminal.ansiBrightMagenta": "#ff77ff",
"terminal.ansiBrightCyan": "#a6fde1",
"terminal.ansiBrightMagenta": "#d4bfff",
"terminal.ansiBrightCyan": "#95e6cb",
"terminal.ansiBrightWhite": "#ffffff"
},
"tokenColors": [
Expand Down
17 changes: 8 additions & 9 deletions ayu-mirage.json
Expand Up @@ -161,24 +161,23 @@
"gitDecoration.submoduleResourceForeground": "#d4bfffb3",
"settings.headerForeground": "#cbccc6",
"settings.modifiedItemIndicator": "#77a8d9",
"settings.checkboxForeground": "#d4bfff",
"terminal.background": "#1f2430",
"terminal.foreground": "#cbccc6",
"terminal.ansiBlack": "#191e2a",
"terminal.ansiRed": "#f28779",
"terminal.ansiRed": "#ed8274",
"terminal.ansiGreen": "#a6cc70",
"terminal.ansiYellow": "#ffcc66",
"terminal.ansiYellow": "#fad07b",
"terminal.ansiBlue": "#6dcbfa",
"terminal.ansiMagenta": "#d4bfff",
"terminal.ansiCyan": "#95e6cb",
"terminal.ansiMagenta": "#cfbafa",
"terminal.ansiCyan": "#90e1c6",
"terminal.ansiWhite": "#c7c7c7",
"terminal.ansiBrightBlack": "#686868",
"terminal.ansiBrightRed": "#ffe6b3",
"terminal.ansiBrightRed": "#f28779",
"terminal.ansiBrightGreen": "#bae67e",
"terminal.ansiBrightYellow": "#ffdf80",
"terminal.ansiBrightYellow": "#ffd580",
"terminal.ansiBrightBlue": "#73d0ff",
"terminal.ansiBrightMagenta": "#ff77ff",
"terminal.ansiBrightCyan": "#a6fde1",
"terminal.ansiBrightMagenta": "#d4bfff",
"terminal.ansiBrightCyan": "#95e6cb",
"terminal.ansiBrightWhite": "#ffffff"
},
"tokenColors": [
Expand Down
11 changes: 11 additions & 0 deletions colors.sh
@@ -0,0 +1,11 @@
#!/usr/bin/env bash

echo -e "\033[0mNC (No color)"
echo -e "\033[1;37mWHITE\t\033[0;30mBLACK"
echo -e "\033[0;34mBLUE\t\033[1;34mBRIGHT_BLUE"
echo -e "\033[0;32mGREEN\t\033[1;32mBRIGHT_GREEN"
echo -e "\033[0;36mCYAN\t\033[1;36mBRIGHT_CYAN"
echo -e "\033[0;31mRED\t\033[1;31mBRIGHT_RED"
echo -e "\033[0;35mVIOLET\t\033[1;35mBRIGHT_VIOLET"
echo -e "\033[0;33mYELLOW\t\033[1;33mBRIGHT_YELLOW"
echo -e "\033[1;30mGRAY\t\033[0;37mBRIGHT_GRAY"
43 changes: 8 additions & 35 deletions src/template.ts
Expand Up @@ -5,47 +5,20 @@ export type SchemeName = keyof typeof ayu
const terminalColors = {
light: {
black: '#000000',
red: ayu.light.syntax.markup.hex(),
yellow: ayu.light.syntax.func.hex(),
magenta: '#9966cc',
white: '#c7c7c7',
brightBlack: '#686868',
brightRed: '#d6656a',
brightGreen: '#a3d900',
brightYellow: ayu.light.syntax.operator.hex(),
brightBlue: '#6871ff',
brightMagenta: ayu.light.syntax.constant.hex(),
brightCyan: '#57d9ad',
brightWhite: '#ffffff'
},
dark: {
black: ayu.dark.ui.line.hex(),
red: ayu.dark.syntax.markup.hex(),
yellow: ayu.dark.syntax.func.hex(),
magenta: '#ca30c7',
white: '#c7c7c7',
brightBlack: '#686868',
brightGreen: '#cbe645',
brightRed: ayu.dark.syntax.special.hex(),
brightYellow: ayu.dark.syntax.constant.hex(),
brightBlue: '#6871ff',
brightMagenta: '#ff77ff',
brightCyan: '#a6fde1',
brightWhite: '#ffffff'
},
mirage: {
black: ayu.mirage.ui.line.hex(),
red: ayu.mirage.syntax.markup.hex(),
yellow: ayu.mirage.common.accent.hex(),
magenta: ayu.mirage.syntax.constant.hex(),
white: '#c7c7c7',
brightBlack: '#686868',
brightGreen: '#cbe645',
brightRed: ayu.mirage.syntax.special.hex(),
brightYellow: '#ffdf80',
brightBlue: '#6871ff',
brightMagenta: '#ff77ff',
brightCyan: '#a6fde1',
brightWhite: '#ffffff'
}
}
Expand Down Expand Up @@ -334,20 +307,20 @@ export default (variant: SchemeName, bordered: boolean) => {
'terminal.background': scheme.common.bg.hex(),
'terminal.foreground': scheme.common.fg.hex(),
'terminal.ansiBlack': terminalColors[variant].black,
'terminal.ansiRed': terminalColors[variant].red,
'terminal.ansiRed': scheme.syntax.markup.darken(.1).hex(),
'terminal.ansiGreen': scheme.vcs.added.hex(),
'terminal.ansiYellow': terminalColors[variant].yellow,
'terminal.ansiYellow': scheme.syntax.func.darken(.1).hex(),
'terminal.ansiBlue': scheme.syntax.entity.darken(.1).hex(),
'terminal.ansiMagenta': terminalColors[variant].magenta,
'terminal.ansiCyan': scheme.syntax.regexp.hex(),
'terminal.ansiMagenta': scheme.syntax.constant.darken(.1).hex(),
'terminal.ansiCyan': scheme.syntax.regexp.darken(.1).hex(),
'terminal.ansiWhite': terminalColors[variant].white,
'terminal.ansiBrightBlack': terminalColors[variant].brightBlack,
'terminal.ansiBrightRed': terminalColors[variant].brightRed,
'terminal.ansiBrightRed': scheme.syntax.markup.hex(),
'terminal.ansiBrightGreen': scheme.syntax.string.hex(),
'terminal.ansiBrightYellow': terminalColors[variant].brightYellow,
'terminal.ansiBrightYellow': scheme.syntax.func.hex(),
'terminal.ansiBrightBlue': scheme.syntax.entity.hex(),
'terminal.ansiBrightMagenta': terminalColors[variant].brightMagenta,
'terminal.ansiBrightCyan': terminalColors[variant].brightCyan,
'terminal.ansiBrightMagenta': scheme.syntax.constant.hex(),
'terminal.ansiBrightCyan': scheme.syntax.regexp.hex(),
'terminal.ansiBrightWhite': terminalColors[variant].brightWhite
},

Expand Down

0 comments on commit 3042d73

Please sign in to comment.