From 02ae0df2cc0633541d74da574c517d5f4c9986fe Mon Sep 17 00:00:00 2001 From: Tom Hirschberger Date: Sun, 24 Feb 2019 11:48:14 +0100 Subject: [PATCH 1/2] add font-awesome.css to styles of alert.js --- modules/default/alert/alert.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js index cc0ae30228..9c0d91a78f 100644 --- a/modules/default/alert/alert.js +++ b/modules/default/alert/alert.js @@ -24,7 +24,7 @@ Module.register("alert",{ return ["classie.js", "modernizr.custom.js", "notificationFx.js"]; }, getStyles: function() { - return ["ns-default.css"]; + return ["ns-default.css", "font-awesome.css"]; }, // Define required translations. getTranslations: function() { From 7b8de354053e7b7bd265f6b6206e746d62333653 Mon Sep 17 00:00:00 2001 From: Thomas Hirschberger <47733292+Tom-Hirschberger@users.noreply.github.com> Date: Sun, 24 Feb 2019 11:55:46 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ee49dcfbb..38aa9f255a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Danish translation for "Feels" and "Weeks" - Added option to split multiple day events in calendar to separate numbered events - Slovakian translation +- Alerts now can contain Font Awesome icons ### Updated - Bumped the Electron dependency to v3.0.13 to support the most recent Raspbian. [#1500](https://github.com/MichMich/MagicMirror/issues/1500)