-
Notifications
You must be signed in to change notification settings - Fork 2
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
Bump bootstrap from 4.6.2 to 5.0.0 #215
Conversation
37b7f8f
to
e3e95d0
Compare
e3e95d0
to
e66982c
Compare
ca7db4f
to
ede0a90
Compare
I noticed that Next, the jumbotron (the gray dashboard) was deprecated. Bootstrap suggests using their updated classes to achieve a similar design, but I remembered there's a nice component for this in the MUI library called I think it looks even better than before. Another issue was the lack of bottom margin in input fields after the Bootstrap update. To fix this, I added a default I also replaced the deprecated I replaced The last issue I'm still working on is the big padding between buttons in a row, which only appears on larger screens: |
@LaChope please have a look :) |
I understand MUI as an alternative to Bootstrap, having different philosophies on how styling works and is applied in source code.
Ok, you can work on that. |
43fa980
to
2324fc8
Compare
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.
LGTM, but not sure if we can safely merge:
- to me it seems safer to merge SForms migration to bootstrap 5 first, but if you are sure it will work correctly you can merge now
fccbc3b
to
8c96ea1
Compare
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.
LGTM, can be rebased+merged If my comments are resolved, just do not forget to use new version of SForms ... we need to bump it as well
src/components/HelpIcon.jsx
Outdated
<OverlayTrigger placement="right" overlay={tooltip}> | ||
{icon()} | ||
</OverlayTrigger> | ||
<> |
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.
The new source code looks kinda complicated... Why we had to do this? OverlayTrigger does not exist anymore?
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.
Or Bootstrap 5 does not support tooltips anymore?
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.
By the way I see:
import { OverlayTrigger, Popover, Table } from "react-bootstrap";
in file
import { OverlayTrigger, Popover, Table } from "react-bootstrap"; |
How is it related? Isn't Popover
alternative to tooltips? If so, we should definitely unify the way -- i.e., having Popover
in both places or not having Popover
at all !?
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.
I was struggling with OverlayTrigger. After migrating, the tooltip was rendering outside of the window, and I couldn't fix its position. In the latest commit, I replaced OverlayTrigger with the Overlay component from Bootstrap, which resolved the issue. I also removed the popover.
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.
See my comments.
src/components/HelpIcon.jsx
Outdated
<OverlayTrigger placement="right" overlay={tooltip}> | ||
{icon()} | ||
</OverlayTrigger> | ||
<> |
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.
By the way I see:
import { OverlayTrigger, Popover, Table } from "react-bootstrap";
in file
import { OverlayTrigger, Popover, Table } from "react-bootstrap"; |
How is it related? Isn't Popover
alternative to tooltips? If so, we should definitely unify the way -- i.e., having Popover
in both places or not having Popover
at all !?
ef78a57
to
f0fe3b3
Compare
@blcham, I also updated Node to version 18 in the Dockerfile because there were some errors during the build process. |
f0fe3b3
to
741f8fb
Compare
👀 |
We need to publish a new version of SForms to NPM so I can test it with RM. |
@palagdan you can use:
|
Not sure, but believe you can deduce "name of version" from hash of the last commit |
@blcham |
deploy/shared/db-server/import/record-manager-formgen/forms/example-2-form.ttl
Outdated
Show resolved
Hide resolved
e4514ef
to
a447c6c
Compare
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.
@palagdan LGTM, but I do not understand why you did not upgrade s-forms in package.json to the version where SForms is migrated to bootstrap 5.0.0
You can use s-forms 0.8.0 for it (I have just released this version)
I thought we would discuss first which version of SForms to use. I checked https://www.npmjs.com/package/@kbss-cvut/s-forms and there is no 0.8.0 there. |
@palagdan sry, it should be there now -- https://www.npmjs.com/package/@kbss-cvut/s-forms/v/0.8.0 |
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.6.2 to 5.0.0. - [Release notes](https://github.com/twbs/bootstrap/releases) - [Commits](twbs/bootstrap@v4.6.2...v5.0.0) --- updated-dependencies: - dependency-name: bootstrap dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Replace deprecated Jumbotron with bootstrap classes
a447c6c
to
186a8f9
Compare
Resolve #236 #235 #227
Bumps bootstrap from 4.6.2 to 5.0.0.
Release notes
Sourced from bootstrap's releases.
... (truncated)
Commits
bf09367
Release v5.0.0 (#33647)48ae5a7
Rewrite migration guide (#33834)f086572
refactor(docs): Added form file input variables (#33833)1a54286
Fix doc typo and Bootstrap Icons link (#33832)e2df73f
Update migration guide for some v5 changes (#33829)1e6356a
Neutralise more words from placeholder text (#33731)6633845
Bump eslint-config-xo from 0.35.0 to 0.36.0 (#33646)cb38744
Tweak toast docs (#33810)c2ff225
Bump rollup from 2.46.0 to 2.47.0 (#33818)c090ea2
Bump@babel/preset-env
from 7.14.0 to 7.14.1 (#33819)You can trigger a rebase of this PR by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditions
will show all of the ignore conditions of the specified dependency@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)You can disable automated security fix PRs for this repo from the Security Alerts page.