implemented nicinabox theme

This commit is contained in:
dzannotti 2015-08-11 22:14:10 +01:00
parent 65d9e5831b
commit a695bb25a3
8 changed files with 8 additions and 18 deletions

View File

@ -100,7 +100,7 @@ export default class JSONArrayNode extends React.Component {
if (this.state.expanded) { if (this.state.expanded) {
spanStyle = { spanStyle = {
...spanStyle, ...spanStyle,
color: this.props.theme.base05 color: this.props.theme.base03
}; };
} }
return ( return (

View File

@ -28,7 +28,7 @@ export default class JSONArrow extends React.Component {
render() { render() {
let style = { let style = {
...styles.base, ...styles.base,
borderTopColor: this.props.theme.base0C borderTopColor: this.props.theme.base0D
}; };
if (this.props.open) { if (this.props.open) {
style = { style = {

View File

@ -33,7 +33,7 @@ export default class JSONBooleanNode extends React.Component {
}}> }}>
{this.props.keyName}: {this.props.keyName}:
</label> </label>
<span style={{ color: this.props.theme.base0F }}>{truthString}</span> <span style={{ color: this.props.theme.base09 }}>{truthString}</span>
</li> </li>
); );
} }

View File

@ -32,7 +32,7 @@ export default class JSONNumberNode extends React.Component {
}}> }}>
{this.props.keyName}: {this.props.keyName}:
</label> </label>
<span style={{ color: this.props.theme.base09 }}>{this.props.value}</span> <span style={{ color: this.props.theme.base0E }}>{this.props.value}</span>
</li> </li>
); );
} }

View File

@ -102,7 +102,7 @@ export default class JSONObjectNode extends React.Component {
if (this.state.expanded) { if (this.state.expanded) {
spanStyle = { spanStyle = {
...spanStyle, ...spanStyle,
color: this.props.theme.base05 color: this.props.theme.base03
}; };
} }
return ( return (

View File

@ -32,7 +32,7 @@ export default class JSONStringNode extends React.Component {
}}> }}>
{this.props.keyName}: {this.props.keyName}:
</label> </label>
<span style={{ color: this.props.theme.base0B }}>{this.props.value}</span> <span style={{ color: this.props.theme.base0B }}>"{this.props.value}"</span>
</li> </li>
); );
} }

View File

@ -51,7 +51,7 @@ export default class LogMonitorEntry {
paddingLeft: 0, paddingLeft: 0,
paddingRight: 5, paddingRight: 5,
fontStyle: 'italic', fontStyle: 'italic',
color: this.props.theme.base08 color: this.props.theme.base09
}}> }}>
({errorText}) ({errorText})
</span> </span>
@ -69,7 +69,6 @@ export default class LogMonitorEntry {
const { index, error, action, state, collapsed } = this.props; const { index, error, action, state, collapsed } = this.props;
const styleEntry = { const styleEntry = {
opacity: collapsed ? 0.5 : 1, opacity: collapsed ? 0.5 : 1,
color: colorFromString(this.props.theme, action.type),
cursor: (index > 0) ? 'pointer' : 'default' cursor: (index > 0) ? 'pointer' : 'default'
}; };
return ( return (
@ -82,7 +81,6 @@ export default class LogMonitorEntry {
style={{...styles.entry, ...styleEntry}}/> style={{...styles.entry, ...styleEntry}}/>
{!collapsed && {!collapsed &&
<div style={{ <div style={{
borderBottom: '1px solid #20262c',
paddingLeft: 15 paddingLeft: 15
}}> }}>
{this.printState(state, error)} {this.printState(state, error)}

View File

@ -2,12 +2,6 @@ import React from 'react';
import JSONTree from './JSONTree'; import JSONTree from './JSONTree';
const styles = { const styles = {
wrapper: {
borderTopWidth: 1,
borderBottomWidth: 1,
borderTopStyle: 'solid',
borderBottomStyle: 'solid'
},
actionBar: { actionBar: {
paddingTop: 6, paddingTop: 6,
paddingBottom: 4, paddingBottom: 4,
@ -36,10 +30,8 @@ export default class LogMonitorAction extends React.Component {
const { type, ...payload } = this.props.action; const { type, ...payload } = this.props.action;
return ( return (
<div style={{ <div style={{
...styles.wrapper,
backgroundColor: this.props.theme.base02, backgroundColor: this.props.theme.base02,
borderTopColor: this.props.theme.base00, color: this.props.theme.base06,
borderBottomColor: this.props.theme.base03,
...this.props.style ...this.props.style
}} onClick={this.props.onClick}> }} onClick={this.props.onClick}>
<div style={styles.actionBar}>{type}</div> <div style={styles.actionBar}>{type}</div>