Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Upgrade to Bootstrap v5.3.1 #749

Merged
merged 35 commits into from
Aug 22, 2023
Merged

Upgrade to Bootstrap v5.3.1 #749

merged 35 commits into from
Aug 22, 2023

Conversation

cpsievert
Copy link
Collaborator

@cpsievert cpsievert commented Aug 15, 2023

Closes #743

For reference, here are the Bootstrap changes twbs/bootstrap@v5.2.2...v5.3.1

Notable "breaking" changes

  • As a part of this update, I decided to move logic in tools/patches/033-accordion-defaults.patch (which made opinionated styling decisions about accordions in a "global" way) to inst/builtin/bs5/shiny/, effectively meaning that accordions will go back to the usual Bootstrap styling by default (at least until we make bs_theme(preset="shiny") the default)

TODO

  • Resolve patch conflicts
  • Can we get away without 027-navbar-active-color-bs5-legacy?
  • radios and checkboxes look broken, maybe something went wrong with 023-shiny-forms patch?
  • Make sure bs_theme_preview() works

@cpsievert cpsievert marked this pull request as ready for review August 22, 2023 14:10
Copy link
Member

@gadenbuie gadenbuie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I read through the changes and this all looks good to me! I'm okay taking this now and addressing fixes in smaller PRs, if any arise.

Similarly, I don't think we should set preset = "shiny" yet since I'm sure we'll have to make some adjustments there after this (or at least it might save us some work if we're lucky).

Co-authored-by: Garrick Aden-Buie <garrick@adenbuie.com>
@cpsievert cpsievert merged commit a4e487c into main Aug 22, 2023
@cpsievert cpsievert deleted the bootstrap-v5.3.1 branch August 22, 2023 20:49
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade Bootstrap from 5.2 to 5.3
2 participants