Merge pull request #1427 from P-Storm/develop

Added Font-awesome 5

CHANGELOG.md

@@ -10,7 +10,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 *This release is scheduled to be released on 2018-10-01.*
 
 ### Added
-- Added `showEnd` documentation
+- Font-awesome 5, still has 4 for backwards compatibility.
+- Missing `showEnd` in calendar documentation
 - Screenshot for the new feed module
 - Screenshot for the compliments module
 - Screenshot for the clock module

config/config.js.sample

@@ -44,7 +44,7 @@ var config = {
 			config: {
 				calendars: [
 					{
-						symbol: "calendar-check-o ",
+						symbol: "calendar-check",
 						url: "webcal://www.calendarlabs.com/templates/ical/US-Holidays.ics"
 					}
 				]

modules/default/calendar/calendar.js

@@ -51,7 +51,7 @@ Module.register("calendar", {
 
 	// Define required scripts.
 	getStyles: function () {
-		return ["calendar.css", "font-awesome.css"];
+		return ["calendar.css", "font-awesome5.css", "font-awesome5.v4shims.css"];
 	},
 
 	// Define required scripts.

vendor/package.json

@@ -10,6 +10,7 @@
     "url": "https://github.com/MichMich/MagicMirror/issues"
   },
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^5.3.1",
     "font-awesome": "^4.7.0",
     "moment": "^2.17.1",
     "moment-timezone": "^0.5.11",

vendor/vendor.js

@@ -13,6 +13,8 @@ var vendor = {
 	"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",
 	"nunjucks.js": "node_modules/nunjucks/browser/nunjucks.min.js"
 };