diff --git a/index.js b/index.js index de66ab6..3421e5e 100644 --- a/index.js +++ b/index.js @@ -9,13 +9,12 @@ import preset from 'jss-preset-default'; import normalize from 'normalize-jss'; import queryString from 'query-string'; import getMuiTheme from 'material-ui/styles/getMuiTheme'; -import { blue400, blue500, blue700 } from 'material-ui/styles/colors'; +import { grey400, blue500, blue700 } from 'material-ui/styles/colors'; const muiTheme = getMuiTheme({ palette: { primary1Color: blue500, primary2Color: blue700, - primary3Color: blue400, accent1Color: blue500, } }); diff --git a/src/interface/FormComponents.js b/src/interface/FormComponents.js index 8128a67..b8ae5d5 100644 --- a/src/interface/FormComponents.js +++ b/src/interface/FormComponents.js @@ -38,7 +38,7 @@ const _TextField = ({ name, muiTheme, ...props }, context) => ( context.onChange(name, null)} />} - floatingLabelStyle={{ color: context.advancedFields.includes(name) ? muiTheme.palette.primary3Color : muiTheme.palette.disabledColor }} + floatingLabelStyle={{ color: context.advancedFields.includes(name) ? muiTheme.palette.primary1Color : muiTheme.palette.primary3Color }} disabled={context.disabled} value={_.get(context, name)} onChange={(event, value) => context.onChange(name, value)} @@ -53,7 +53,7 @@ const _NumberField = ({ name, min, max, muiTheme, ...props }, context) => ( {...props} type="number" icon={context.advancedFields.includes(name) && context.onChange(name, null)} />} - floatingLabelStyle={{ color: context.advancedFields.includes(name) ? muiTheme.palette.primary3Color : muiTheme.palette.disabledColor }} + floatingLabelStyle={{ color: context.advancedFields.includes(name) ? muiTheme.palette.primary1Color : muiTheme.palette.primary3Color }} disabled={context.disabled} value={_.get(context, name.toString())} onChange={(event, value) => { @@ -73,7 +73,7 @@ export const _Checkbox = ({ name, muiTheme, ...props }, context) => ( context.onChange(name, value)} diff --git a/src/interface/utils.js b/src/interface/utils.js index 48acc3e..64aeb58 100644 --- a/src/interface/utils.js +++ b/src/interface/utils.js @@ -58,7 +58,7 @@ export function createScene({ pixelRatio, muiTheme }) { const mesh = new Mesh(new THREE.Geometry(), material); scene.add(mesh); - const box = new BoxHelper(new Mesh(new BoxGeometry(1, 1, 1).applyMatrix(new Matrix4().makeTranslation(0, 0.5, 0))), muiTheme.palette.primary3Color); + const box = new BoxHelper(new Mesh(new BoxGeometry(1, 1, 1).applyMatrix(new Matrix4().makeTranslation(0, 0.5, 0))), muiTheme.palette.primary2Color); scene.add(box); let renderer = new WebGLRenderer({ alpha: true, antialias: true });