Skip to content
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

feat(styling): add support for Bootstrap 5 #657

Merged
merged 4 commits into from
Jan 4, 2021

Conversation

gcko
Copy link
Contributor

@gcko gcko commented Jan 3, 2021

  • Fix border-radius styling for .headerrow columns
  • Ensure ui-slider maintains correct left margin
  • handle changes to .input-group styling within Bootstrap
  • Handle .input-group inner content height
  • Appropriately size pagination (previous version was cutting off the bottom 6 pixels)
  • Vertically align the pagination icons
  • Ignore .naverc file (used for managing multiple node versions)

This is done in conjunction with the addition of a demonstration of Bootstrap 5 support in the Angular Bootstrap Demos repository.

- Fix border-radius styling for headerrow columns
- Ensure ui-slider maintains correct left margin
- handle changes to .input-group styling within Bootstrap
- Handle input-group inner content height
- Appropriately size pagination (previous version was cutting off the bottom 6 pixels)
- Vertically align the pagination icons
- Ignore .naverc file (used for managing multiple node versions)
@ghiscoding
Copy link
Owner

Thanks this is great to support BS5... just a quick question, I assume this has no impact on BS3, BS4 implementations... correct?

@gcko
Copy link
Contributor Author

gcko commented Jan 3, 2021

Thanks this is great to support BS5... just a quick question, I assume this has no impact on BS3, BS4 implementations... correct?

@ghiscoding There is no impact on BS3/BS4, including any changes to existing visual bugs in BS4:

For Example, the following is how the BS4 theme looks:
Screen Shot 2021-01-03 at 17 11 32

And in the BS5 theme:
Screen Shot 2021-01-03 at 17 13 48

- Migrate values to `_variables.scss`
- Switch to using px for line-height to keep it consistent with the current implementation
@ghiscoding
Copy link
Owner

After reviewing your PR a bit further, I got final changes to ask before merging

  1. can you move the Flatpickr style changes into the slick-plugins.scss file which holds most of the Flatpickr styling
  2. can you also move the Pagination style changes into slick-component.scss which is where all the Pagination styling are

The rest is all good in the bootstrap file.

- Migrate Flatpickr styling to `slick-plugins.scss`
- Migrate Pagination styling to `slick-component.scss`
@gcko
Copy link
Contributor Author

gcko commented Jan 4, 2021

After reviewing your PR a bit further, I got final changes to ask before merging

  1. can you move the Flatpickr style changes into the slick-plugins.scss file which holds most of the Flatpickr styling
  2. can you also move the Pagination style changes into slick-component.scss which is where all the Pagination styling are

The rest is all good in the bootstrap file.

@ghiscoding Addressed your comments in 378d25f, please take a look

@ghiscoding ghiscoding changed the title Add support for Bootstrap 5 feat(styling): add support for Bootstrap 5 Jan 4, 2021
- Add a sibling selector to .flatpickr
@ghiscoding ghiscoding merged commit 7f06d40 into ghiscoding:master Jan 4, 2021
@ghiscoding
Copy link
Owner

merge, expect a week or two before a new release since I got a few PRs in the queue.

Thanks a lot for the contribution. ⭐

Do you have a rough idea of when BS5 is to be released?
I'm guessing end of Q1

@gcko
Copy link
Contributor Author

gcko commented Jan 4, 2021

merge, expect a week or two before a new release since I got a few PRs in the queue.

Thanks a lot for the contribution. ⭐

Do you have a rough idea of when BS5 is to be released?
I'm guessing end of Q1

Thanks for your quick execution on this, it's much appreciated. BS5 is already released (check https://getbootstrap.com/), it currently is Beta-1. I expect that to become a stable release by end of Q1.

@ghiscoding
Copy link
Owner

This is now fixed and released in the new version 2.25.0, see Release Note.

I also merged your Angular-Slickgrid-Demos PR and bump the Angular-Slickgrid version and used Bootstrap @next until it's released. Thanks a lot for your contribution on this 😉

Cheers ⭐

@gcko
Copy link
Contributor Author

gcko commented Jan 7, 2021 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants