-
-
Notifications
You must be signed in to change notification settings - Fork 79
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.
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
Fix display issue with TitledBox in Project Form #1658
Conversation
Want to review this pull request? Take a look at this documentation for a step by step guide! From your project repository, check out a new branch and test the changes.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In running this I'm getting an error. It looks like isLoading hasn't been defined or passed in as props. Can you take a look?
./src/components/ProjectForm.js
Line 277:40: 'isLoading' is not defined no-undef
@lcchrty just checking in! Would you be able to take a look at the error @spiteless posted above? |
I'll look into this -- I think some edits from another issue I was working on wormed their way into this PR. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for slow-walking this. We ended up with a merge conflict.
Would you like to take a crack at it first? I'm happy to help resolve it if needed :)
# git fetch upstream
# git merge upstream/development
M CONTRIBUTING.md
UU client/src/components/ProjectForm.js # merge conflict here
M client/src/components/admin/donutChartContainer.js
M client/src/components/admin/donutChartLoading.js
M client/src/components/auth/Auth.js
M client/src/pages/ManageProjects.js
M client/src/sass/AdminLogin.scss
Fixes hackforla#1646 Merge updates to development branch and fixes merge conflicts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
draft of requested changes
2b88bc1
to
194e38f
Compare
d7f777d
to
439e99a
Compare
@trillium merge conflict resolved! CI/CD failing though... |
FYI - the failing tests are not an issue with your PR specifically, this has to do with the CI/CD pipeline. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for this fix :)
Fixes #1646
What changes did you make and why did you make them ?
Screenshots of Proposed Changes Of The Website (if any, please do not screen shot code changes)
Visuals before changes are applied
Visuals after changes are applied