kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1586 from Tom-Hirschberger/feature/alert-fontawesome

Browse Source 
Feature/alert fontawesome
This commit is contained in:
Michael Teeuw 2019-02-24 19:58:44 +01:00 committed by GitHub
commit cff2f64155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Danish translation for "Feels" and "Weeks" - Danish translation for "Feels" and "Weeks"
- Added option to split multiple day events in calendar to separate numbered events - Added option to split multiple day events in calendar to separate numbered events
- Slovakian translation - Slovakian translation
- Alerts now can contain Font Awesome icons
### Updated ### Updated
- Bumped the Electron dependency to v3.0.13 to support the most recent Raspbian. [#1500](https://github.com/MichMich/MagicMirror/issues/1500) - Bumped the Electron dependency to v3.0.13 to support the most recent Raspbian. [#1500](https://github.com/MichMich/MagicMirror/issues/1500)

2
modules/default/alert/alert.js
View File

@ -24,7 +24,7 @@ Module.register("alert",{
return ["classie.js", "modernizr.custom.js", "notificationFx.js"]; return ["classie.js", "modernizr.custom.js", "notificationFx.js"];
}, },
getStyles: function() { getStyles: function() {
return ["ns-default.css"]; return ["ns-default.css", "font-awesome.css"];
}, },
// Define required translations. // Define required translations.
getTranslations: function() { getTranslations: function() {