Skip to content

Commit c46fbf5

Browse files
author
rodriguez-facundo
committed
#147 Styling
1 parent 31f278e commit c46fbf5

63 files changed

Lines changed: 543 additions & 716 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎webapp/components/definition/cellRules/NetPyNECellRule.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ class NetPyNECellRule extends React.Component {
9797
<div className={classes.root}>
9898

9999
<TextField
100+
variant="filled"
100101
onChange={this.handleRenameChange}
101102
value={this.state.currentName}
102103
disabled={this.renaming}

‎webapp/components/definition/cellRules/sections/NetPyNESection.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ export default class NetPyNESection extends React.Component {
9494
content = (
9595
<div>
9696
<TextField
97+
variant="filled"
9798
id={"cellParamsSectionName"}
9899
onChange={this.handleRenameChange}
99100
value = {this.state.currentName}
@@ -106,19 +107,19 @@ export default class NetPyNESection extends React.Component {
106107

107108
content = (<div>
108109
<NetPyNEField id="netParams.cellParams.secs.geom.diam" >
109-
<NetPyNETextField model={"netParams.cellParams['" + this.props.cellRule + "']['secs']['" + this.props.name + "']['geom']['diam']"} />
110+
<NetPyNETextField variant="filled" model={"netParams.cellParams['" + this.props.cellRule + "']['secs']['" + this.props.name + "']['geom']['diam']"} />
110111
</NetPyNEField>
111112

112113
<NetPyNEField id="netParams.cellParams.secs.geom.L" >
113-
<NetPyNETextField model={"netParams.cellParams['" + this.props.cellRule + "']['secs']['" + this.props.name + "']['geom']['L']"} />
114+
<NetPyNETextField variant="filled" model={"netParams.cellParams['" + this.props.cellRule + "']['secs']['" + this.props.name + "']['geom']['L']"} />
114115
</NetPyNEField>
115116

116117
<NetPyNEField id="netParams.cellParams.secs.geom.Ra" >
117-
<NetPyNETextField model={"netParams.cellParams['" + this.props.cellRule + "']['secs']['" + this.props.name + "']['geom']['Ra']"} />
118+
<NetPyNETextField variant="filled" model={"netParams.cellParams['" + this.props.cellRule + "']['secs']['" + this.props.name + "']['geom']['Ra']"} />
118119
</NetPyNEField>
119120

120121
<NetPyNEField id="netParams.cellParams.secs.geom.cm" >
121-
<NetPyNETextField model={"netParams.cellParams['" + this.props.cellRule + "']['secs']['" + this.props.name + "']['geom']['cm']"} />
122+
<NetPyNETextField variant="filled" model={"netParams.cellParams['" + this.props.cellRule + "']['secs']['" + this.props.name + "']['geom']['cm']"} />
122123
</NetPyNEField>
123124

124125
<NetPyNEField id="netParams.cellParams.secs.geom.pt3d" className="listStyle">
@@ -140,13 +141,15 @@ export default class NetPyNESection extends React.Component {
140141

141142
<NetPyNEField id="netParams.cellParams.secs.topol.parentX" >
142143
<NetPyNETextField
144+
variant="filled"
143145
model={"netParams.cellParams['" + this.props.cellRule + "']['secs']['" + this.props.name + "']['topol']['parentX']"}
144146
/>
145147
</NetPyNEField>
146148
<br />
147149

148150
<NetPyNEField id="netParams.cellParams.secs.topol.childX" >
149151
<NetPyNETextField
152+
variant="filled"
150153
model={"netParams.cellParams['" + this.props.cellRule + "']['secs']['" + this.props.name + "']['topol']['childX']"}
151154
/>
152155
</NetPyNEField>

‎webapp/components/definition/cellRules/sections/mechanisms/NetPyNEMechanism.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class NetPyNEMechanism extends React.Component {
3030
} else {
3131
var tag = "netParams.cellParams['" + this.props.cellRule + "']['secs']['" + this.props.section + "']['mechs']['" + this.state.currentName + "']"
3232
return this.state.mechFields.map((name, i) =>
33-
<NetPyNETextField id={"mechName" + name} name={name} key={name} model={tag + "['" + name + "']"} label={name} realType={"float"} className={classes.fields}/>
33+
<NetPyNETextField variant="filled" variant="filled" id={"mechName" + name} name={name} key={name} model={tag + "['" + name + "']"} label={name} realType={"float"} className={classes.fields}/>
3434
)
3535
}
3636
};
@@ -52,6 +52,7 @@ class NetPyNEMechanism extends React.Component {
5252
return (
5353
<div>
5454
<TextField
55+
variant="filled"
5556
id={"singleMechName"}
5657
key="netpyneField"
5758
value={this.state.currentName}

‎webapp/components/definition/configuration/NetPyNESimConfig.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ class NetPyNESimConfig extends React.Component {
3737
contentLeft = (
3838
<div>
3939
<NetPyNEField id="simConfig.duration" >
40-
<NetPyNETextField model={"simConfig.duration"} />
40+
<NetPyNETextField variant="filled" model={"simConfig.duration"} />
4141
</NetPyNEField>
4242

4343
<NetPyNEField id="simConfig.dt" >
44-
<NetPyNETextField model={"simConfig.dt"} />
44+
<NetPyNETextField variant="filled" model={"simConfig.dt"} />
4545
</NetPyNEField>
4646

4747
<NetPyNEField id="simConfig.printRunTime" >
48-
<NetPyNETextField model={"simConfig.printRunTime"} />
48+
<NetPyNETextField variant="filled" model={"simConfig.printRunTime"} />
4949
</NetPyNEField>
5050

5151
<NetPyNEField id="simConfig.hParams" className="listStyle">
@@ -125,26 +125,26 @@ class NetPyNESimConfig extends React.Component {
125125
contentLeft = (
126126
<div>
127127
<NetPyNEField id="simConfig.simLabel" >
128-
<NetPyNETextField model={"simConfig.simLabel"} />
128+
<NetPyNETextField variant="filled" model={"simConfig.simLabel"} />
129129
</NetPyNEField>
130130

131131
{
132132
!window.isDocker
133133
&& <NetPyNEField id="simConfig.saveFolder" >
134-
<NetPyNETextField model={"simConfig.saveFolder"} />
134+
<NetPyNETextField variant="filled" model={"simConfig.saveFolder"} />
135135
</NetPyNEField>
136136
}
137137

138138
<NetPyNEField id="simConfig.filename" >
139-
<NetPyNETextField model={"simConfig.filename"} />
139+
<NetPyNETextField variant="filled" model={"simConfig.filename"} />
140140
</NetPyNEField>
141141

142142
<NetPyNEField id="simConfig.saveDataInclude" className="listStyle">
143143
<ListComponent model={"simConfig.saveDataInclude"} />
144144
</NetPyNEField>
145145

146146
<NetPyNEField id="simConfig.backupCfgFile" >
147-
<NetPyNETextField model={"simConfig.backupCfgFile"} />
147+
<NetPyNETextField variant="filled" model={"simConfig.backupCfgFile"} />
148148
</NetPyNEField>
149149

150150
</div>
@@ -212,7 +212,7 @@ class NetPyNESimConfig extends React.Component {
212212
</NetPyNEField>
213213

214214
<NetPyNEField id="simConfig.recordStep" >
215-
<NetPyNETextField model={"simConfig.recordStep"} />
215+
<NetPyNETextField variant="filled" model={"simConfig.recordStep"} />
216216
</NetPyNEField>
217217

218218
</div>
@@ -232,23 +232,23 @@ class NetPyNESimConfig extends React.Component {
232232
var contentLeft = (
233233
<div >
234234
<NetPyNEField id="netParams.scale" >
235-
<NetPyNETextField model={"netParams.scale"} />
235+
<NetPyNETextField variant="filled" model={"netParams.scale"} />
236236
</NetPyNEField>
237237

238238
<NetPyNEField id="netParams.defaultWeight" >
239-
<NetPyNETextField model={"netParams.defaultWeight"} />
239+
<NetPyNETextField variant="filled" model={"netParams.defaultWeight"} />
240240
</NetPyNEField>
241241

242242
<NetPyNEField id="netParams.defaultDelay" >
243-
<NetPyNETextField model={"netParams.defaultDelay"} />
243+
<NetPyNETextField variant="filled" model={"netParams.defaultDelay"} />
244244
</NetPyNEField>
245245

246246
<NetPyNEField id="netParams.scaleConnWeight" >
247-
<NetPyNETextField model={"netParams.scaleConnWeight"} />
247+
<NetPyNETextField variant="filled" model={"netParams.scaleConnWeight"} />
248248
</NetPyNEField>
249249

250250
<NetPyNEField id="netParams.scaleConnWeightNetStims" >
251-
<NetPyNETextField model={"netParams.scaleConnWeightNetStims"} />
251+
<NetPyNETextField variant="filled" model={"netParams.scaleConnWeightNetStims"} />
252252
</NetPyNEField>
253253

254254
<NetPyNEField id="netParams.scaleConnWeightModels" className={"listStyle"}>
@@ -260,27 +260,27 @@ class NetPyNESimConfig extends React.Component {
260260
contentRight = (
261261
<div >
262262
<NetPyNEField id="netParams.sizeX" >
263-
<NetPyNETextField model={"netParams.sizeX"} />
263+
<NetPyNETextField variant="filled" model={"netParams.sizeX"} />
264264
</NetPyNEField>
265265

266266
<NetPyNEField id="netParams.sizeY" >
267-
<NetPyNETextField model={"netParams.sizeY"} />
267+
<NetPyNETextField variant="filled" model={"netParams.sizeY"} />
268268
</NetPyNEField>
269269

270270
<NetPyNEField id="netParams.sizeZ" >
271-
<NetPyNETextField model={"netParams.sizeZ"} />
271+
<NetPyNETextField variant="filled" model={"netParams.sizeZ"} />
272272
</NetPyNEField>
273273

274274
<NetPyNEField id="netParams.propVelocity" >
275-
<NetPyNETextField model={"netParams.propVelocity"} />
275+
<NetPyNETextField variant="filled" model={"netParams.propVelocity"} />
276276
</NetPyNEField>
277277

278278
<NetPyNEField id="netParams.shape">
279-
<SelectField model={"netParams.shape"} />
279+
<SelectField variant="filled" model={"netParams.shape"} />
280280
</NetPyNEField>
281281

282282
<NetPyNEField id="netParams.rotateCellsRandomly" >
283-
<NetPyNETextField model={"netParams.rotateCellsRandomly"} />
283+
<NetPyNETextField variant="filled" model={"netParams.rotateCellsRandomly"} />
284284
</NetPyNEField>
285285

286286
</div>

‎webapp/components/definition/connectivity/NetPyNEConnectivityRule.js‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ export default class NetPyNEConnectivityRule extends React.Component {
134134
var content = (
135135
<div>
136136
<TextField
137+
variant="filled"
137138
id={"ConnectivityName"}
138139
onChange={this.handleRenameChange}
139140
value={this.state.currentName}
@@ -171,31 +172,31 @@ export default class NetPyNEConnectivityRule extends React.Component {
171172
</NetPyNEField>
172173

173174
<NetPyNEField id="netParams.connParams.convergence">
174-
<NetPyNETextField model={"netParams.connParams['" + this.props.name + "']['convergence']"}/>
175+
<NetPyNETextField variant="filled" model={"netParams.connParams['" + this.props.name + "']['convergence']"}/>
175176
</NetPyNEField>
176177

177178
<NetPyNEField id="netParams.connParams.divergence">
178-
<NetPyNETextField model={"netParams.connParams['" + this.props.name + "']['divergence']"}/>
179+
<NetPyNETextField variant="filled" model={"netParams.connParams['" + this.props.name + "']['divergence']"}/>
179180
</NetPyNEField>
180181

181182
<NetPyNEField id="netParams.connParams.probability">
182-
<NetPyNETextField model={"netParams.connParams['" + this.props.name + "']['probability']"}/>
183+
<NetPyNETextField variant="filled" model={"netParams.connParams['" + this.props.name + "']['probability']"}/>
183184
</NetPyNEField>
184185

185186
<NetPyNEField id="netParams.connParams.synsPerConn">
186-
<NetPyNETextField model={"netParams.connParams['" + this.props.name + "']['synsPerConn']"}/>
187+
<NetPyNETextField variant="filled" model={"netParams.connParams['" + this.props.name + "']['synsPerConn']"}/>
187188
</NetPyNEField>
188189

189190
<NetPyNEField id="netParams.connParams.weight">
190-
<NetPyNETextField model={"netParams.connParams['" + this.props.name + "']['weight']"}/>
191+
<NetPyNETextField variant="filled" model={"netParams.connParams['" + this.props.name + "']['weight']"}/>
191192
</NetPyNEField>
192193

193194
<NetPyNEField id="netParams.connParams.delay">
194-
<NetPyNETextField model={"netParams.connParams['" + this.props.name + "']['delay']"} />
195+
<NetPyNETextField variant="filled" model={"netParams.connParams['" + this.props.name + "']['delay']"} />
195196
</NetPyNEField>
196197

197198
<NetPyNEField id="netParams.connParams.plasticity">
198-
<NetPyNETextField model={"netParams.connParams['" + this.props.name + "']['plasticity']"}/>
199+
<NetPyNETextField variant="filled" model={"netParams.connParams['" + this.props.name + "']['plasticity']"}/>
199200
</NetPyNEField>
200201
{dialogPop}
201202
</div>

‎webapp/components/definition/plots/NetPyNEInclude.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ export default class NetPyNEInclude extends Component {
345345
return <div>
346346
<NetPyNEField id={this.props.id}>
347347
<TextField
348+
variant="filled"
348349
label="Include in the plot"
349350
value={this.state.label}
350351
onClick={e => this.handleMainPopoverOpen(true, e.preventDefault(), e.currentTarget)}

‎webapp/components/definition/plots/TimeRange.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ export default class TimeRange extends Component {
2929
}
3030
}}
3131
>
32-
<TextField label="Starting time" id="min" style={{ marginLeft: 10 }}/>
33-
<TextField label="Ending time" id="max" style={{ marginLeft: 10 }}/>
32+
<TextField variant="filled" label="Starting time" id="min" style={{ marginLeft: 10 }}/>
33+
<TextField variant="filled" label="Ending time" id="max" style={{ marginLeft: 10 }}/>
3434
</AdapterComponent>
3535
</div>
3636
);

‎webapp/components/definition/plots/plotTypes/PlotGranger.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ export default class PlotGranger extends React.Component {
3535
</NetPyNEField>
3636

3737
<NetPyNEField id="simConfig.analysis.granger.label1" >
38-
<NetPyNETextField model={tags + "['label1']"}/>
38+
<NetPyNETextField variant="filled" model={tags + "['label1']"}/>
3939
</NetPyNEField>
4040

4141
<NetPyNEField id="simConfig.analysis.granger.label2" >
42-
<NetPyNETextField model={tags + "['label2']"}/>
42+
<NetPyNETextField variant="filled" model={tags + "['label2']"}/>
4343
</NetPyNEField>
4444

4545
<NetPyNEField id="simConfig.analysis.granger.timeRange" >
4646
<TimeRange model={tags + "['timeRange']"} />
4747
</NetPyNEField>
4848

4949
<NetPyNEField id="simConfig.analysis.granger.binSize" >
50-
<NetPyNETextField model={tags + "['binSize']"} />
50+
<NetPyNETextField variant="filled" model={tags + "['binSize']"} />
5151
</NetPyNEField>
5252
</div>
5353
);

‎webapp/components/definition/plots/plotTypes/PlotLFP.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ export default class PlotLFP extends React.Component {
3131
</NetPyNEField>
3232

3333
<NetPyNEField id="simConfig.analysis.plotLFP.NFFT" >
34-
<NetPyNETextField model={tag + "['NFFT']"}/>
34+
<NetPyNETextField variant="filled" model={tag + "['NFFT']"}/>
3535
</NetPyNEField>
3636

3737
<NetPyNEField id="simConfig.analysis.plotLFP.noverlap" >
38-
<NetPyNETextField model={tag + "['noverlap']"}/>
38+
<NetPyNETextField variant="filled" model={tag + "['noverlap']"}/>
3939
</NetPyNEField>
4040

4141
<NetPyNEField id="simConfig.analysis.plotLFP.maxFreq" >
42-
<NetPyNETextField model={tag + "['maxFreq']"}/>
42+
<NetPyNETextField variant="filled" model={tag + "['maxFreq']"}/>
4343
</NetPyNEField>
4444

4545
<NetPyNEField id="simConfig.analysis.plotLFP.nperseg" >
46-
<NetPyNETextField model={tag + "['nperseg']"}/>
46+
<NetPyNETextField variant="filled" model={tag + "['nperseg']"}/>
4747
</NetPyNEField>
4848

4949
<NetPyNEField id="simConfig.analysis.plotLFP.smooth" >
50-
<NetPyNETextField model={tag + "['smooth']"}/>
50+
<NetPyNETextField variant="filled" model={tag + "['smooth']"}/>
5151
</NetPyNEField>
5252

5353
<NetPyNEField id="simConfig.analysis.plotLFP.separation" >
54-
<NetPyNETextField model={tag + "['separation']"}/>
54+
<NetPyNETextField variant="filled" model={tag + "['separation']"}/>
5555
</NetPyNEField>
5656

5757
<NetPyNEField id="simConfig.analysis.plotLFP.includeAxon" className={"netpyneCheckbox"} >

‎webapp/components/definition/plots/plotTypes/PlotRaster.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default class PlotRaster extends React.Component {
3737
</NetPyNEField>
3838

3939
<NetPyNEField id="simConfig.analysis.plotRaster.maxSpikes" >
40-
<NetPyNETextField model={tag + "['maxSpikes']"}/>
40+
<NetPyNETextField variant="filled" model={tag + "['maxSpikes']"}/>
4141
</NetPyNEField>
4242

4343
<NetPyNEField id="simConfig.analysis.plotRaster.orderBy" className="listStyle" >
@@ -53,7 +53,7 @@ export default class PlotRaster extends React.Component {
5353
</NetPyNEField>
5454

5555
<NetPyNEField id="simConfig.analysis.plotRaster.spikeHistBin" >
56-
<NetPyNETextField model={tag + "['spikeHistBin']"}/>
56+
<NetPyNETextField variant="filled" model={tag + "['spikeHistBin']"}/>
5757
</NetPyNEField>
5858

5959
<NetPyNEField id="simConfig.analysis.plotRaster.orderInverse" className={"netpyneCheckbox"} >

0 commit comments

Comments
 (0)