Skip to content

Commit 9cc1a25

Browse files
committed
Adjust expression styles to fill column width
I've realized that the expressions we want to input here may be quite long, and may even call for a `<textarea>`. For now, I've adjusted things to allow for a bit more space here with these inputs.
1 parent 97113af commit 9cc1a25

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

media/js/src/editors/TemplateGraphEditor.jsx

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ export default class TemplateGraphEditor extends React.Component {
2222
render() {
2323
return (
2424
<>
25-
<div className="d-flex flex-wrap">
25+
<div className="d-flex flex-column">
2626
<div className="row">
27-
<div className="col">
27+
<div className="col d-flex">
2828
<label
29-
className="form-check-label me-2"
29+
className="form-check-label me-2 flex-shrink-1 d-flex align-self-center"
3030
htmlFor="gExpression">
3131
<MathJaxProvider>
3232
<MathJaxFormula formula="$$y = $$" />
@@ -35,6 +35,7 @@ export default class TemplateGraphEditor extends React.Component {
3535
<EditableControl
3636
id="gExpression"
3737
name="Expression"
38+
className="w-100"
3839
value={this.props.gExpression}
3940
valueEditable={true}
4041
onBlur={true}
@@ -49,11 +50,11 @@ export default class TemplateGraphEditor extends React.Component {
4950
</div>
5051
</div>
5152

52-
<div className="d-flex flex-wrap mt-2">
53+
<div className="d-flex flex-column mt-2">
5354
<div className="row">
54-
<div className="col">
55+
<div className="col d-flex">
5556
<label
56-
className="form-check-label me-2"
57+
className="form-check-label me-2 flex-shrink-1 d-flex align-self-center"
5758
htmlFor="gExpression2">
5859
<MathJaxProvider>
5960
<MathJaxFormula formula="$$y = $$" />
@@ -63,6 +64,7 @@ export default class TemplateGraphEditor extends React.Component {
6364
<EditableControl
6465
id="gExpression2"
6566
name="Expression 2"
67+
className="w-100"
6668
value={this.props.gExpression2}
6769
valueEditable={true}
6870
onBlur={true}
@@ -77,11 +79,11 @@ export default class TemplateGraphEditor extends React.Component {
7779
</div>
7880
</div>
7981

80-
<div className="d-flex flex-wrap mt-2">
82+
<div className="d-flex flex-column mt-2">
8183
<div className="row">
82-
<div className="col">
84+
<div className="col d-flex">
8385
<label
84-
className="form-check-label me-2"
86+
className="form-check-label me-2 flex-shrink-1 d-flex align-self-center"
8587
htmlFor="gExpression3">
8688
<MathJaxProvider>
8789
<MathJaxFormula formula="$$y = $$" />
@@ -91,6 +93,7 @@ export default class TemplateGraphEditor extends React.Component {
9193
<EditableControl
9294
id="gExpression3"
9395
name="Expression 3"
96+
className="w-100"
9497
value={this.props.gExpression3}
9598
valueEditable={true}
9699
onBlur={true}

media/js/src/form-components/EditableControl.jsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default class EditableControl extends React.Component {
3939
return (
4040
<React.Fragment>
4141
{(this.props.isInstructor || this.props.valueEditable) && (
42-
<label>
42+
<label className={this.props.className}>
4343
{this.props.name}
4444
{input}
4545
</label>
@@ -60,6 +60,10 @@ EditableControl.propTypes = {
6060
isInstructor: PropTypes.bool.isRequired,
6161
value: PropTypes.string,
6262
valueEditable: PropTypes.bool.isRequired,
63+
64+
// Custom classes for the parent element of this component.
65+
className: PropTypes.string,
66+
6367
onBlur: PropTypes.bool,
6468
disabled: PropTypes.bool,
6569
maxLength: PropTypes.number

0 commit comments

Comments
 (0)