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.

Sign up for GitHub

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

Jump to bottom

Fix conflict between font awesome versions as per #1522 #1525

Merged
merged 5 commits into from
Jan 10, 2019
Merged

Fix conflict between font awesome versions as per #1522 #1525

merged 5 commits into from
Jan 10, 2019

Conversation

ianperrin
Copy link
Contributor

Proposal to fix #1522

  • Remove font awesome 4 from dependencies in vendor/package.json
  • Add custom font-awesome.css to allow multiple css to be included for one vendor i.e. both the full font awesome css (all.min.css) and the v4-shim css (v4-shims.min.css) for backward compatibility
  • Modify vendor.js so font awesome 5 (with backwards compatibility) is used for all modules
  • Revert font awesome references in default calendar module

@MichMich
Copy link
Collaborator

Nice work. Could you add an updated changelog reflecting the fix?

@MichMich MichMich closed this Jan 10, 2019
@MichMich MichMich reopened this Jan 10, 2019
@ianperrin
Copy link
Contributor Author

Nice work. Could you add an updated changelog reflecting the fix?

Done

@MichMich MichMich merged commit 992802d into MagicMirrorOrg:develop Jan 10, 2019
@MichMich
Copy link
Collaborator

Thanks!

@antondollmaier antondollmaier mentioned this pull request Feb 17, 2019
Open
qistoph added a commit to qistoph/MMM-Remote-Control that referenced this pull request Mar 28, 2019
@qistoph
Fix font-awesome URL
59807d9 
The path of the font-awesome CSS changed with
MagicMirrorOrg/MagicMirror#1525
@qistoph qistoph mentioned this pull request Mar 28, 2019
Closed
@ianperrin ianperrin mentioned this pull request Apr 3, 2019
Closed
@snyk-bot snyk-bot mentioned this pull request Jul 31, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ianperrin @MichMich