vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2025-01-09 11:04:24 +01:00
Code Issues Projects Releases Wiki Activity

remove primary color 3

Browse Source
This commit is contained in:
casperlamboo 2018-01-17 14:58:36 +01:00
parent a8b3d68845
commit 9f1958563d
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.js
View File

@ -9,13 +9,12 @@ import preset from 'jss-preset-default';
import normalize from 'normalize-jss'; import normalize from 'normalize-jss';
import queryString from 'query-string'; import queryString from 'query-string';
import getMuiTheme from 'material-ui/styles/getMuiTheme'; 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({ const muiTheme = getMuiTheme({
palette: { palette: {
primary1Color: blue500, primary1Color: blue500,
primary2Color: blue700, primary2Color: blue700,
primary3Color: blue400,
accent1Color: blue500, accent1Color: blue500,
} }
}); });

6
src/interface/FormComponents.js
View File

@ -38,7 +38,7 @@ const _TextField = ({ name, muiTheme, ...props }, context) => (
<TextFieldIcon <TextFieldIcon
{...props} {...props}
icon={context.advancedFields.includes(name) && <RefreshIcon style={{ fill: muiTheme.palette.textColor }} onTouchTap={() => context.onChange(name, null)} />} icon={context.advancedFields.includes(name) && <RefreshIcon style={{ fill: muiTheme.palette.textColor }} onTouchTap={() => 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} disabled={context.disabled}
value={_.get(context, name)} value={_.get(context, name)}
onChange={(event, value) => context.onChange(name, value)} onChange={(event, value) => context.onChange(name, value)}
@ -53,7 +53,7 @@ const _NumberField = ({ name, min, max, muiTheme, ...props }, context) => (
{...props} {...props}
type="number" type="number"
icon={context.advancedFields.includes(name) && <RefreshIcon style={{ fill: muiTheme.palette.textColor }} onTouchTap={() => context.onChange(name, null)} />} icon={context.advancedFields.includes(name) && <RefreshIcon style={{ fill: muiTheme.palette.textColor }} onTouchTap={() => 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} disabled={context.disabled}
value={_.get(context, name.toString())} value={_.get(context, name.toString())}
onChange={(event, value) => { onChange={(event, value) => {
@ -73,7 +73,7 @@ export const _Checkbox = ({ name, muiTheme, ...props }, context) => (
<MaterialUICheckbox <MaterialUICheckbox
{...props} {...props}
style={{ display: 'block' }} style={{ display: 'block' }}
iconStyle={{ fill: context.advancedFields.includes(name) ? muiTheme.palette.primary3Color : muiTheme.palette.disabledColor }} iconStyle={{ fill: context.advancedFields.includes(name) ? muiTheme.palette.primary1Color : muiTheme.palette.primary3Color }}
disabled={context.disabled} disabled={context.disabled}
checked={_.get(context, name)} checked={_.get(context, name)}
onCheck={(event, value) => context.onChange(name, value)} onCheck={(event, value) => context.onChange(name, value)}

2
src/interface/utils.js
View File

@ -58,7 +58,7 @@ export function createScene({ pixelRatio, muiTheme }) {
const mesh = new Mesh(new THREE.Geometry(), material); const mesh = new Mesh(new THREE.Geometry(), material);
scene.add(mesh); 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); scene.add(box);
let renderer = new WebGLRenderer({ alpha: true, antialias: true }); let renderer = new WebGLRenderer({ alpha: true, antialias: true });