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

Bootstrap integration: replace images with font icons #142

Merged
merged 1 commit into from
Feb 10, 2015

Conversation

mweimerskirch
Copy link
Contributor

No description provided.

@mweimerskirch
Copy link
Contributor Author

I just noticed that my editor also did some code cleanup (removing trailing spaces and unifying indentions). I can undo those changes if that is an issue

@DataTables
Copy link
Collaborator

Thanks for this. Yes, there are a number of unrelated changes that I wouldn't want to pull in (at least not in this pull request - the fix of mixed tabs and spaces I should do myself though - that's messy!), but I think the basic idea is okay. I've never been fully comfortable with the Glyphicon Halflings license and the knock on effect that it has (a link back where available) which is why I've not used it to date. Probably just me being overly touchy about licenses, but I'm still not certain.

I'll probably not pull it in immediately, but play around a bit.

If I do pull it in, can you confirm you are happy with it being under the MIT license?

@mweimerskirch
Copy link
Contributor Author

No problem, I'll undo the other changes.

As to the license, the version distributed with Bootstrap is licensed under the MIT license: http://glyphicons.com/license/ ("GLYPHICONS Halflings are also a part of Bootstrap from Twitter, and they are released under the same license as Bootstrap.")

I confirm that I agree to the code being released under the MIT license.

@DataTables
Copy link
Collaborator

Ah - that is good to know! Thanks :-). I misinterpreted the Bootstrap manual in that case. I don't see any reason why I won't pull this in then, but it will likely be in the new year, as I'm packing up for a little holiday at the moment :-)

@mweimerskirch
Copy link
Contributor Author

There you go. Pull request cleaned.
Have a nice holiday. :-)

DataTables pushed a commit that referenced this pull request Feb 10, 2015
New - Bootstrap integration: replace images with font icons
@DataTables DataTables merged commit 96cdbf9 into DataTables:master Feb 10, 2015
@DataTables
Copy link
Collaborator

Finally getting around to this now - thanks for the PR :-).

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