Fix ValueRenderer code block theme

This commit is contained in:
Thomas Nordquist
2019-04-08 14:12:20 +02:00
parent acbe20070b
commit 7e5e6013ab
2 changed files with 28 additions and 12 deletions

View File

@@ -5,4 +5,15 @@ export enum CodeBlockColors {
boolean = '#811F24', boolean = '#811F24',
string = '#0B6125', string = '#0B6125',
variable = '#234A97', variable = '#234A97',
gutters = '#ebebeb',
}
export enum CodeBlockColorsBraceMonokai {
text = '#F8F8F2',
background = '#272822',
numeric = '#AE81FF',
boolean = '#AE81FF',
string = '#E6DB74',
variable = '#A6E22E',
gutters = '#2F3129',
} }

View File

@@ -4,7 +4,7 @@ import * as React from 'react'
import { Theme, withStyles } from '@material-ui/core' import { Theme, withStyles } from '@material-ui/core'
import 'prismjs/components/prism-json' import 'prismjs/components/prism-json'
import 'prismjs/themes/prism-tomorrow.css' import 'prismjs/themes/prism-tomorrow.css'
import { CodeBlockColors } from './CodeBlockColors' import { CodeBlockColors, CodeBlockColorsBraceMonokai } from './CodeBlockColors'
interface Props { interface Props {
previous: string previous: string
@@ -84,7 +84,7 @@ class CodeDiff extends React.Component<Props, {}> {
}) })
return ( return (
<div style={{ backgroundColor: '#ebebeb' }}> <div className={this.props.classes.gutters}>
<pre className={`language-json ${this.props.classes.codeBlock}`}> <pre className={`language-json ${this.props.classes.codeBlock}`}>
{code} {code}
</pre> </pre>
@@ -95,13 +95,15 @@ class CodeDiff extends React.Component<Props, {}> {
} }
const style = (theme: Theme) => { const style = (theme: Theme) => {
const codeBlockColors = theme.palette.type === 'light' ? CodeBlockColors : CodeBlockColorsBraceMonokai
const baseStyle = { const baseStyle = {
width: '100%', width: '100%',
} }
const before = { const before = {
margin: '0 2px 0 -9px', margin: '0 2px 0 -9px',
color: CodeBlockColors.text, color: codeBlockColors.text,
} }
return { return {
additions: { additions: {
color: 'rgb(10, 255, 10)', color: 'rgb(10, 255, 10)',
@@ -112,34 +114,37 @@ const style = (theme: Theme) => {
line: { line: {
lineHeight: 'normal', lineHeight: 'normal',
}, },
gutters: {
backgroundColor: codeBlockColors.gutters,
},
codeBlock: { codeBlock: {
fontSize: '12px', fontSize: '12px',
maxHeight: '200px', maxHeight: '200px',
marginLeft: '33px !important', marginLeft: '33px !important',
backgroundColor: `${CodeBlockColors.background} !important`, backgroundColor: `${codeBlockColors.background} !important`,
'& span': { '& span': {
color: CodeBlockColors.text, color: codeBlockColors.text,
}, },
'& .token.number': { '& .token.number': {
color: CodeBlockColors.numeric, color: codeBlockColors.numeric,
}, },
'& .token.boolean': { '& .token.boolean': {
color: CodeBlockColors.numeric, color: codeBlockColors.numeric,
}, },
'& .token.property': { '& .token.property': {
color: CodeBlockColors.variable, color: codeBlockColors.variable,
}, },
'& .token.string': { '& .token.string': {
color: CodeBlockColors.string, color: codeBlockColors.string,
}, },
'& .token': { '& .token': {
color: CodeBlockColors.text, color: codeBlockColors.text,
}, },
'& .token.operator': { '& .token.operator': {
color: CodeBlockColors.text, color: codeBlockColors.text,
}, },
'& .token.punctuation': { '& .token.punctuation': {
color: CodeBlockColors.text, color: codeBlockColors.text,
}, },
}, },
noChange: { noChange: {