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

Issue 2013 #2014

Merged
merged 7 commits into from
Jul 4, 2016
Merged

Issue 2013 #2014

merged 7 commits into from
Jul 4, 2016

Conversation

pointnet
Copy link

@pointnet pointnet commented Jul 4, 2016

@pointnet
Copy link
Author

pointnet commented Jul 4, 2016

Appveyor failed because it use react 15.2.0, do I need to change the package.json in the PR ?

@taion
Copy link
Member

taion commented Jul 4, 2016

Looks fine to me.

@@ -31,11 +40,13 @@ export default class DropdownToggle extends React.Component {
DropdownToggle.defaultProps = {
open: false,
useAnchor: false,
bsRole: 'toggle'
bsRole: 'toggle',
bsClass: 'dropdown'
Copy link
Member

Choose a reason for hiding this comment

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

for consistency this should be defined via the bsClass helper in bootstrapUtils, other than that looks good 👍

Copy link
Author

Choose a reason for hiding this comment

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

fixed

Copy link
Member

Choose a reason for hiding this comment

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

I've actually been going through and swapping everything out for bsClass on my "update for React v15.2.0" branch.

@jquense
Copy link
Member

jquense commented Jul 4, 2016

LGTM, can't merge from my phone tho

@taion taion merged commit 6edaf53 into react-bootstrap:master Jul 4, 2016
@pointnet pointnet deleted the Issue-2013 branch July 4, 2016 19:22
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.

4 participants