Skip to content
This repository has been archived by the owner on Feb 14, 2019. It is now read-only.

Adds Font Awesome v4 support #264

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Conversation

jperkelens
Copy link

Adds classes to rendered markup and selectors to support the use of Font Awesome. Fixes #160.

@smalot
Copy link
Owner

smalot commented Jun 11, 2014

Can you update too the README file and add a demo folder named "sample in bootstrap v3 with Font Awesome v4" ?
This would be great

@jperkelens
Copy link
Author

@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.

@fellars
Copy link

fellars commented Sep 16, 2014

+1 on accepting this PR. Right now Fontawesome 4 doesn't work

@jperkelens
Copy link
Author

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?

@AuspeXeu
Copy link
Collaborator

@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 :)

@jperkelens
Copy link
Author

I just merged, I believe it should be fixed now.

@AuspeXeu
Copy link
Collaborator

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

@AuspeXeu
Copy link
Collaborator

AuspeXeu commented Sep 1, 2015

@randoum yes because we want to keep the git history tidy

@AuspeXeu
Copy link
Collaborator

AuspeXeu commented Sep 1, 2015

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

@AuspeXeu
Copy link
Collaborator

AuspeXeu commented Sep 1, 2015

Just to clarify my previous comments (since @randoum deleted themn)

  1. "@AuspeXeu is rebase so important that it blocks the merge of this most expected PR?"
  2. "I will be more direct, cause you did not read between the lines :)
    We need this commit, nevermind the rebase
    Thanks for consideration for those who are waiting"
  3. "I perfectly know how, stop calling me stupid of I fly to England to meet you"

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

Successfully merging this pull request may close these issues.

Fontawesome 4 - support
4 participants