Skip to content

Commit

Permalink
Merge commit '8695b0e1338fa7cf81ea970c57e21ed362bb8c71' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
adamnovak committed Sep 5, 2023
2 parents dbbdf1e + 8695b0e commit b9dc0b7
Showing 1 changed file with 29 additions and 23 deletions.
52 changes: 29 additions & 23 deletions src/components/HeaderForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -704,8 +704,12 @@ class HeaderForm extends Component {

return (
<div>
{errorDiv}
<Container fluid={true}>
<Container>
<Row>
<Col>
{errorDiv}
</Col>
</Row>
<Row>
<Col md="auto">
<img src="./logo.png" alt="Logo" />
Expand Down Expand Up @@ -786,27 +790,29 @@ class HeaderForm extends Component {
/>
)}

<Alert
color="danger"
isOpen={this.state.fileSizeAlert}
toggle={() => {
this.setState({ fileSizeAlert: false });
}}
className="mt-3"
>
<strong>File size too big! </strong>
You may only upload files with a maximum size of{" "}
{MAX_UPLOAD_SIZE_DESCRIPTION}.
</Alert>

{examplesFlag ? (
<ExampleSelectButtons
setDataOrigin={this.props.setDataOrigin}
setColorSetting={this.props.setColorSetting}
/>
) : (
!mountedFilesFlag && DataPositionFormRowComponent
)}
<Row>
<Alert
color="danger"
isOpen={this.state.fileSizeAlert}
toggle={() => {
this.setState({ fileSizeAlert: false });
}}
className="mt-3"
>
<strong>File size too big! </strong>
You may only upload files with a maximum size of{" "}
{MAX_UPLOAD_SIZE_DESCRIPTION}.
</Alert>

{examplesFlag ? (
<ExampleSelectButtons
setDataOrigin={this.props.setDataOrigin}
setColorSetting={this.props.setColorSetting}
/>
) : (
!mountedFilesFlag && DataPositionFormRowComponent
)}
</Row>
</Col>
</Row>
</Container>
Expand Down

0 comments on commit b9dc0b7

Please sign in to comment.