kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-01 13:33:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1427 from P-Storm/develop

Browse Source 
Added Font-awesome 5
This commit is contained in:
Michael Teeuw 2018-10-26 15:11:55 +02:00 committed by GitHub
commit 8f014e9d82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 280 additions and 890 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -10,7 +10,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
*This release is scheduled to be released on 2018-10-01.* *This release is scheduled to be released on 2018-10-01.*
### Added ### 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 new feed module
- Screenshot for the compliments module - Screenshot for the compliments module
- Screenshot for the clock module - Screenshot for the clock module

2
config/config.js.sample
View File

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

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

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

982
vendor/package-lock.json generated vendored
View File

File diff suppressed because it is too large Load Diff

1
vendor/package.json vendored
View File

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

2
vendor/vendor.js vendored
View File

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

178
vendor/yarn.lock vendored
View File

File diff suppressed because it is too large Load Diff