-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Adds Font Awesome v4 support #264
base: master
Are you sure you want to change the base?
Conversation
Can you update too the README file and add a demo folder named "sample in bootstrap v3 with Font Awesome v4" ? |
@smalot Done. I wasn't sure what exactly you wanted in the README so I just added a Font Awesome example to the Markup section. |
+1 on accepting this PR. Right now Fontawesome 4 doesn't work |
Hello, its been a couple of months now. I've added what you asked for, is there anything else you'd like me to do for this? |
@jperkelens Would you mind to update this PR (i.e. resolve the conflicts)? I am a new maintainer on this project and would like to see this merged :) |
I just merged, I believe it should be fixed now. |
Actually ... sorry to ask this but could you rather rebase your changes on top of the current repository than merging it. This way we don't have all changes in your commit that happened since then. This should not take long. Just revert your last commit (the merge commit) and then follow these instructions. http://stackoverflow.com/questions/7244321/how-to-update-github-forked-repository |
@randoum yes because we want to keep the git history tidy |
I will be more direct wih you as well. Either you have no idea how git works and thus think that this is not a big deal or you know enough and can just file a proper PR yourself and I am more than happy to merge it. But this is not getting into the repo as it is at the moment. It's an easy fix. If don't know how to do it: http://stackoverflow.com/questions/7244321/how-to-update-github-forked-repository |
Just to clarify my previous comments (since @randoum deleted themn)
|
Adds classes to rendered markup and selectors to support the use of Font Awesome. Fixes #160.