Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#1289 - Don't change whole page font when opening circuit browser #1290

Merged
merged 1 commit into from
Jan 17, 2022
Merged

#1289 - Don't change whole page font when opening circuit browser #1290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 13 additions & 21 deletions components/interface/VFBCircuitBrowser/Controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,10 @@ const theme = createMuiTheme({
overrides : {
MuiSlider: {
markLabelActive: { color: 'white' },
markLabel: { color: 'white' },
markActive: { color: 'red' }
},
MuiButton: {
label: {
fontSize: '12px',
fontFamily: ['Barlow Condensed', 'Khand', "sans-serif"]
},
button : { padding : "" }
markLabel: { color: 'white' }
}
},
typography: {
body1: {
fontSize: 15,
fontFamily : ['Barlow Condensed', 'Khand', "sans-serif"]
}
}
typography: { body1: { fontFamily : ['Barlow Condensed', 'Khand', "sans-serif"] } }
});

/**
Expand Down Expand Up @@ -104,13 +91,18 @@ const styles = theme => ({
backgroundColor : "#0AB7FE",
flexBasis: "100%",
fontWeight : 600,
fontSize: '12px',
fontFamily: ['Barlow Condensed', 'Khand', "sans-serif"]
},
clearButton : {
backgroundColor : "#E53935",
flexBasis: "100%",
fontWeight : 600,
fontSize: '12px',
fontFamily: ['Barlow Condensed', 'Khand', "sans-serif"]
},
slider : { color: '#0AB7FE' }
slider : { color: '#0AB7FE' },
typography : { fontSize : "15px" }
});

/**
Expand Down Expand Up @@ -203,7 +195,7 @@ class AutocompleteResults extends Component {
onChange={this.props.neuronTextfieldModified}
onDelete={this.props.neuronTextfieldModified}
inputProps={{ ...params.inputProps, id: this.props.index, style: { height : "20px", color: "white" ,paddingLeft : "10px", border : "none", backgroundColor: "#80808040" } }}
InputLabelProps={{ ...params.inputProps,style: { color: "white", paddingLeft : "10px" } }}
InputLabelProps={{ ...params.inputProps,style: { color: "white", paddingLeft : "10px", fontSize: "14px" } }}
/>
)}
/>
Expand Down Expand Up @@ -507,7 +499,7 @@ class Controls extends Component {
IconButtonProps={{ style: { padding : "0px", margin : "0px" } }}
>
<div className={classes.column}>
<Typography >Configure circuit</Typography>
<Typography classes={{ root : classes.typography }}>Configure circuit</Typography>
</div>
</AccordionSummary>
<AccordionDetails classes={{ root : classes.details }}>
Expand Down Expand Up @@ -573,7 +565,7 @@ class Controls extends Component {
</IconButton>
</Grid>
<Grid item sm={10} classes={{ root : classes.addNeuron }}>
<Typography>Add Neuron</Typography>
<Typography classes={{ root : classes.typography }}>Add Neuron</Typography>
</Grid>
</Grid>
}
Expand All @@ -584,7 +576,7 @@ class Controls extends Component {
<Grid container justify="space-between" alignItems="center" >
<Grid container spacing={1}>
<Grid item sm={3}>
<Typography># Paths</Typography>
<Typography classes={{ root : classes.typography }}># Paths</Typography>
</Grid>
<Grid item sm={9}>
<Slider
Expand All @@ -602,7 +594,7 @@ class Controls extends Component {
</Grid>
<Grid container spacing={1} alignItems="flex-end">
<Grid item sm={3}>
<Typography>Min Weight</Typography>
<Typography classes={{ root : classes.typography }}>Min Weight</Typography>
</Grid>
<Grid item sm={9}>
<Input className={classes.weightInputDiv} label="Graph weight" defaultValue={this.weight} onChange={this.weightChange} inputProps={{ 'aria-label': 'description', id : "weightField", className : classes.weightInput }} />
Expand Down