diff --git a/app/src/components/Sidebar/CodeBlockColors.ts b/app/src/components/Sidebar/CodeBlockColors.ts index f5939f1..d451abc 100644 --- a/app/src/components/Sidebar/CodeBlockColors.ts +++ b/app/src/components/Sidebar/CodeBlockColors.ts @@ -5,4 +5,15 @@ export enum CodeBlockColors { boolean = '#811F24', string = '#0B6125', variable = '#234A97', + gutters = '#ebebeb', } + +export enum CodeBlockColorsBraceMonokai { + text = '#F8F8F2', + background = '#272822', + numeric = '#AE81FF', + boolean = '#AE81FF', + string = '#E6DB74', + variable = '#A6E22E', + gutters = '#2F3129', +} \ No newline at end of file diff --git a/app/src/components/Sidebar/CodeDiff.tsx b/app/src/components/Sidebar/CodeDiff.tsx index 568f759..5e6eb72 100644 --- a/app/src/components/Sidebar/CodeDiff.tsx +++ b/app/src/components/Sidebar/CodeDiff.tsx @@ -4,7 +4,7 @@ import * as React from 'react' import { Theme, withStyles } from '@material-ui/core' import 'prismjs/components/prism-json' import 'prismjs/themes/prism-tomorrow.css' -import { CodeBlockColors } from './CodeBlockColors' +import { CodeBlockColors, CodeBlockColorsBraceMonokai } from './CodeBlockColors' interface Props { previous: string @@ -84,7 +84,7 @@ class CodeDiff extends React.Component { }) return ( -
+
           {code}
         
@@ -95,13 +95,15 @@ class CodeDiff extends React.Component { } const style = (theme: Theme) => { + const codeBlockColors = theme.palette.type === 'light' ? CodeBlockColors : CodeBlockColorsBraceMonokai const baseStyle = { width: '100%', } const before = { margin: '0 2px 0 -9px', - color: CodeBlockColors.text, + color: codeBlockColors.text, } + return { additions: { color: 'rgb(10, 255, 10)', @@ -112,34 +114,37 @@ const style = (theme: Theme) => { line: { lineHeight: 'normal', }, + gutters: { + backgroundColor: codeBlockColors.gutters, + }, codeBlock: { fontSize: '12px', maxHeight: '200px', marginLeft: '33px !important', - backgroundColor: `${CodeBlockColors.background} !important`, + backgroundColor: `${codeBlockColors.background} !important`, '& span': { - color: CodeBlockColors.text, + color: codeBlockColors.text, }, '& .token.number': { - color: CodeBlockColors.numeric, + color: codeBlockColors.numeric, }, '& .token.boolean': { - color: CodeBlockColors.numeric, + color: codeBlockColors.numeric, }, '& .token.property': { - color: CodeBlockColors.variable, + color: codeBlockColors.variable, }, '& .token.string': { - color: CodeBlockColors.string, + color: codeBlockColors.string, }, '& .token': { - color: CodeBlockColors.text, + color: codeBlockColors.text, }, '& .token.operator': { - color: CodeBlockColors.text, + color: codeBlockColors.text, }, '& .token.punctuation': { - color: CodeBlockColors.text, + color: codeBlockColors.text, }, }, noChange: {