From b01b9758e0503755e97d805d13021be6acf32831 Mon Sep 17 00:00:00 2001 From: Ian Date: Wed, 9 Jan 2019 21:24:14 +0000 Subject: [PATCH 1/5] remove Font Awesome 4 dependency --- vendor/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/vendor/package.json b/vendor/package.json index d14f8bcb00..241374cbc2 100644 --- a/vendor/package.json +++ b/vendor/package.json @@ -11,7 +11,6 @@ }, "dependencies": { "@fortawesome/fontawesome-free": "^5.3.1", - "font-awesome": "^4.7.0", "moment": "^2.17.1", "moment-timezone": "^0.5.11", "nunjucks": "^3.0.1", From ef82039401b5122889fac0d8762a25440328b1e8 Mon Sep 17 00:00:00 2001 From: Ian Date: Wed, 9 Jan 2019 21:29:49 +0000 Subject: [PATCH 2/5] Allow multiple css to be included for one vendor --- vendor/css/font-awesome.css | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 vendor/css/font-awesome.css diff --git a/vendor/css/font-awesome.css b/vendor/css/font-awesome.css new file mode 100644 index 0000000000..2ba4a708ae --- /dev/null +++ b/vendor/css/font-awesome.css @@ -0,0 +1,2 @@ +@import url("../node_modules/@fortawesome/fontawesome-free/css/all.min.css"); +@import url("../node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css"); \ No newline at end of file From 7c3923ad00b1e47b1992987a131d940ae7330fa6 Mon Sep 17 00:00:00 2001 From: Ian Date: Wed, 9 Jan 2019 21:32:43 +0000 Subject: [PATCH 3/5] Use Font Awesome 5 (with backwards compatibility) for all modules --- vendor/vendor.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vendor/vendor.js b/vendor/vendor.js index abbf1423e5..6acf8427ca 100644 --- a/vendor/vendor.js +++ b/vendor/vendor.js @@ -12,9 +12,7 @@ var vendor = { "moment-timezone.js" : "node_modules/moment-timezone/builds/moment-timezone-with-data.js", "weather-icons.css": "node_modules/weathericons/css/weather-icons.css", "weather-icons-wind.css": "node_modules/weathericons/css/weather-icons-wind.css", - "font-awesome.css": "node_modules/font-awesome/css/font-awesome.min.css", - "font-awesome5.css": "node_modules/@fortawesome/fontawesome-free/css/all.min.css", - "font-awesome5.v4shims.css": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css", + "font-awesome.css": "css/font-awesome.css", "nunjucks.js": "node_modules/nunjucks/browser/nunjucks.min.js" }; From 00922891052041c2c9f02926d77ccd5114698bf0 Mon Sep 17 00:00:00 2001 From: Ian Date: Wed, 9 Jan 2019 21:38:07 +0000 Subject: [PATCH 4/5] revert font awesome reference --- modules/default/calendar/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 38b0426979..7b81380928 100755 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -51,7 +51,7 @@ Module.register("calendar", { // Define required scripts. getStyles: function () { - return ["calendar.css", "font-awesome5.css", "font-awesome5.v4shims.css"]; + return ["calendar.css", "font-awesome.css"]; }, // Define required scripts. From 8546d6730c98471d167c858555458720bf4dae29 Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 10 Jan 2019 12:44:35 +0000 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12d84620c8..387dcdb16c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Fixed unhandled error on bad git data in updatenotiifcation module [#1285](https://github.com/MichMich/MagicMirror/issues/1285). - Weather forecast now works with openweathermap in new weather module. Daily data are displayed, see issue [#1504](https://github.com/MichMich/MagicMirror/issues/1504). - Fixed analogue clock border display issue where non-black backgrounds used (previous fix for issue 611) +- Fixed compatibility issues caused when modules request different versions of Font Awesome, see issue [#1522](https://github.com/MichMich/MagicMirror/issues/1522). MagicMirror now uses [Font Awesome 5 with v4 shims included for backwards compatibility](https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#shims). ### New weather module - Fixed weather forecast table display [#1499](https://github.com/MichMich/MagicMirror/issues/1499).