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

Support switch control in forms (BS4 only) #1495

Merged
merged 6 commits into from May 14, 2021

Conversation

lindyhopchris
Copy link
Contributor

Adds a switch control type, for the Bootstrap 4 switch custom control type:
https://getbootstrap.com/docs/4.6/components/forms/#switches

See #912

@lindyhopchris
Copy link
Contributor Author

FYI I couldn't preview the changes to the docs site as it's not working when I run ember s locally in the docs folder - getting an error.

Copy link
Contributor

@jelhan jelhan left a comment

Choose a reason for hiding this comment

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

Thanks a lot for working on this. Haven't had the time yet to do a detailed review. But what I have seen so far looks very good to me. Will try to finish review later today.

FYI I couldn't preview the changes to the docs site as it's not working when I run ember s locally in the docs folder - getting an error.

The docs site is broken since quiet some time. 😞 See #1387 for details.

Copy link
Contributor

@jelhan jelhan left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks a lot for working on this one!

@jelhan jelhan changed the title [Feature] Add switch control Support Bootstrap's switch control in forms (BS4 only) May 12, 2021
@lindyhopchris
Copy link
Contributor Author

@jelhan thanks for reviewing. I'll make those changes to the test when I get a chance (hopefully later today)

Copy link
Contributor

@simonihmig simonihmig left a comment

Choose a reason for hiding this comment

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

Thanks a lot for working on this!

@simonihmig simonihmig changed the title Support Bootstrap's switch control in forms (BS4 only) Support switch control in forms (BS4 only) May 13, 2021
@lindyhopchris
Copy link
Contributor Author

@simonihmig thanks for your comments! All make sense, so I'll be able to push an update. Today is looking busy so hopefully I'll have time tomorrow.

@lindyhopchris
Copy link
Contributor Author

@jelhan @simonihmig

I've pushed the changes based on the review comments, so this should now be ready to merge. Do you need me to fix the merge conflicts? I tried back merging master into my switch branch but then all the tests started to fail.

@simonihmig
Copy link
Contributor

Do you need me to fix the merge conflicts?

Yes, unfortunately I cannot merge it with this conflict. I did a few things here yesterday, so sorry for causing this additional work! 😔

I tried back merging master into my switch branch but then all the tests started to fail.

Hm, what exactly was the error? Did you update your dependencies and restarted ember serve?

@lindyhopchris
Copy link
Contributor Author

@simonihmig have pushed the merge fix. Turned out the failing tests were due to a bad merge on my part, re-did the merge and worked out how to fix it, so all should be good now.

Copy link
Contributor

@simonihmig simonihmig left a comment

Choose a reason for hiding this comment

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

Thanks a lot again!

@simonihmig simonihmig merged commit 43282e7 into ember-bootstrap:master May 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants