-
Notifications
You must be signed in to change notification settings - Fork 48
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
Bootstrap 5 views #2066
Bootstrap 5 views #2066
Conversation
This commit is a first swing of upgrading all the views from Bootstrap 3 to 4. There's still a lot of work to be done to make the views look good but this is a good first step.
The override was causing issues not passing the nav-link class into the anchor tags. This fix specifically passes the title attribute in vs the previous implementation of trying to pass all html options in.
This commit will remove the override for the `required` translations since it changed to a badge badge-style in Bootstrap 4. This is accounted for in Hyrax so we can fall back to that.
This commit will fix a few javascript errors, at least enough to get the the bootstrap javascript to work correctly. We're still getting a the almond-rails js error but that seems to exist in previous Hyku as well.
* 🧹Rubocop Fixes * Attempt to fix circleci
5a9b0b7
to
a16d786
Compare
<td><%= role.description_label %> | ||
<td> | ||
<%= simple_form_for :remove_role_from_group, url: admin_group_role_path(group_id: @group.to_param, role_id: role.id), method: :delete, html: { class: 'form' } do |f| %> | ||
<%= f.submit class: 'btn btn-danger', disabled: @group.name == ::Ability.admin_group_name && role.name == 'admin', id: "remove-role-#{role.id}-from-group" %> |
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.
TODO: Yuck to this boolean, but I see it is carried over.
Seems like there's an ability logic that we could be writing. Because it's trivial to enable the submit button in HTML and that means the form could still be submitted to.
I see one more spec failure than in the upgrade branch (I'm betting on a flaky spec) so I'm okaying it on a spec basis. I didn't go through all of the code but was a bit curious about the many button changes (primary to secondary, etc). Did Hyrax change their buttons? |
I'm actually surprised there's only one extra failure. Yes, button classes did change in Hyrax because of the bootstrap 3 to 4 upgrade. I saw many |
These are adjustments made after the PR has been reviewed.
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.
All comments addressed!
🧹 Upgrade views from Bootstrap 3 to 4
67f3163
This commit is a first swing of upgrading all the views from Bootstrap 3
to 4. There's still a lot of work to be done to make the views look
good but this is a good first step.
🧹 Fix CollapsableSectionPresenter override
50cad0c
The override was causing issues not passing the nav-link class into the
anchor tags. This fix specifically passes the title attribute in vs the
previous implementation of trying to pass all html options in.
🧹 Remove required translations from locales
9782c7b
This commit will remove the override for the
required
translationssince it changed to a badge badge-style in Bootstrap 4. This is
accounted for in Hyrax so we can fall back to that.
🐛 Fix some javascript errors
69dcb74
This commit will fix a few javascript errors, at least enough to get the
the bootstrap javascript to work correctly. We're still getting a the
almond-rails js error but that seems to exist in previous Hyku as well.
Ref: