From b5eb4377519336920e7eb391dc9fb75998f22898 Mon Sep 17 00:00:00 2001 From: CHaBou Date: Tue, 5 Sep 2017 18:29:37 +0200 Subject: [PATCH] Use config.colors for 16 first ANSI colors --- lib/components/style-sheet.js | 65 ++++++++++++++++++----------------- lib/components/terms.js | 1 + 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/lib/components/style-sheet.js b/lib/components/style-sheet.js index 67a245e8..962fe694 100644 --- a/lib/components/style-sheet.js +++ b/lib/components/style-sheet.js @@ -4,6 +4,7 @@ export default class StyleSheet extends React.PureComponent { render () { const { customCSS, + colors, cursorColor, fontSize, fontFamily, @@ -199,131 +200,131 @@ export default class StyleSheet extends React.PureComponent { } .terminal .xterm-color-0 { - color: #2e3436; + color: ${colors.black}; } .terminal .xterm-bg-color-0 { - background-color: #2e3436; + background-color: ${colors.black}; } .terminal .xterm-color-1 { - color: #cc0000; + color: ${colors.red}; } .terminal .xterm-bg-color-1 { - background-color: #cc0000; + background-color: ${colors.red}; } .terminal .xterm-color-2 { - color: #4e9a06; + color: ${colors.green}; } .terminal .xterm-bg-color-2 { - background-color: #4e9a06; + background-color: ${colors.green}; } .terminal .xterm-color-3 { - color: #c4a000; + color: ${colors.yellow}; } .terminal .xterm-bg-color-3 { - background-color: #c4a000; + background-color: ${colors.yellow}; } .terminal .xterm-color-4 { - color: #3465a4; + color: ${colors.blue}; } .terminal .xterm-bg-color-4 { - background-color: #3465a4; + background-color: ${colors.blue}; } .terminal .xterm-color-5 { - color: #75507b; + color: ${colors.magenta}; } .terminal .xterm-bg-color-5 { - background-color: #75507b; + background-color: ${colors.magenta}; } .terminal .xterm-color-6 { - color: #06989a; + color: ${colors.cyan}; } .terminal .xterm-bg-color-6 { - background-color: #06989a; + background-color: ${colors.cyan}; } .terminal .xterm-color-7 { - color: #d3d7cf; + color: ${colors.white}; } .terminal .xterm-bg-color-7 { - background-color: #d3d7cf; + background-color: ${colors.white}; } .terminal .xterm-color-8 { - color: #555753; + color: ${colors.lightBlack}; } .terminal .xterm-bg-color-8 { - background-color: #555753; + background-color: ${colors.lightBlack}; } .terminal .xterm-color-9 { - color: #ef2929; + color: ${colors.lightRed}; } .terminal .xterm-bg-color-9 { - background-color: #ef2929; + background-color: ${colors.lightRed}; } .terminal .xterm-color-10 { - color: #8ae234; + color: ${colors.lightGreen}; } .terminal .xterm-bg-color-10 { - background-color: #8ae234; + background-color: ${colors.lightGreen}; } .terminal .xterm-color-11 { - color: #fce94f; + color: ${colors.lightYellow}; } .terminal .xterm-bg-color-11 { - background-color: #fce94f; + background-color: ${colors.lightYellow}; } .terminal .xterm-color-12 { - color: #729fcf; + color: ${colors.lightBlue}; } .terminal .xterm-bg-color-12 { - background-color: #729fcf; + background-color: ${colors.lightBlue}; } .terminal .xterm-color-13 { - color: #ad7fa8; + color: ${colors.lightMagenta}; } .terminal .xterm-bg-color-13 { - background-color: #ad7fa8; + background-color: ${colors.lightMagenta}; } .terminal .xterm-color-14 { - color: #34e2e2; + color: ${colors.lightCyan}; } .terminal .xterm-bg-color-14 { - background-color: #34e2e2; + background-color: ${colors.lightCyan}; } .terminal .xterm-color-15 { - color: #eeeeec; + color: ${colors.lightWhite}; } .terminal .xterm-bg-color-15 { - background-color: #eeeeec; + background-color: ${colors.lightWhite}; } .terminal .xterm-color-16 { diff --git a/lib/components/terms.js b/lib/components/terms.js index d0f258bc..663dccf9 100644 --- a/lib/components/terms.js +++ b/lib/components/terms.js @@ -120,6 +120,7 @@ export default class Terms extends Component { } { this.props.customChildren }