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

Merge pull request #1602 from qistoph/develop

Browse Source 
Notifications delay time and background color
This commit is contained in:
Michael Teeuw 2019-03-19 09:36:24 +01:00 committed by GitHub
commit edfa327158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- 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 - Alerts now can contain Font Awesome icons
- Notifications display time can be set in request
### 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)
@ -39,6 +40,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Fix null dereference in moduleNeedsUpdate when the module isn't visible - Fix null dereference in moduleNeedsUpdate when the module isn't visible
- Calendar: Fixed event end times by setting default calendarEndTime to "LT" (Local time format). [#1479] - Calendar: Fixed event end times by setting default calendarEndTime to "LT" (Local time format). [#1479]
- Calendar: Fixed missing calendar fetchers after server process restarts [#1589](https://github.com/MichMich/MagicMirror/issues/1589) - Calendar: Fixed missing calendar fetchers after server process restarts [#1589](https://github.com/MichMich/MagicMirror/issues/1589)
- Notification: fixed background color (was white text on white background)
- Use getHeader instead of data.header when creating the DOM so overwriting the function also propagates into it - Use getHeader instead of data.header when creating the DOM so overwriting the function also propagates into it
### New weather module ### New weather module

9
modules/default/alert/README.md
View File

@ -43,10 +43,11 @@ self.sendNotification("SHOW_ALERT", {});
``` ```
### Notification params ### Notification params
| Option | Description | Option | Description
| --------- | ----------- | ------------------ | -----------
| `title` | The title of the notification. <br><br> **Possible values:** `text` or `html` | `title` | The title of the notification. <br><br> **Possible values:** `text` or `html`
| `message` | The message of the notification. <br><br> **Possible values:** `text` or `html` | `message` | The message of the notification. <br><br> **Possible values:** `text` or `html`
| `timer` (optional) | How long the notification should stay visible in ms. <br> If absent, the default `display_time` is used. <br> **Possible values:** `int` `float`
### Alert params ### Alert params

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

@ -51,7 +51,7 @@ Module.register("alert",{
message: msg, message: msg,
layout: "growl", layout: "growl",
effect: this.config.effect, effect: this.config.effect,
ttl: this.config.display_time ttl: message.timer !== undefined ? message.timer : this.config.display_time
}).show(); }).show();
}, },
show_alert: function(params, sender) { show_alert: function(params, sender) {

5
modules/default/alert/ns-default.css
View File

@ -1,7 +1,7 @@
/* Based on work by http://tympanus.net/codrops/licensing/ */ /* Based on work by http://tympanus.net/codrops/licensing/ */
.ns-box { .ns-box {
background: #fff; background-color: rgba(0, 0, 0, 0.93);
padding: 17px; padding: 17px;
line-height: 1.4; line-height: 1.4;
margin-bottom: 10px; margin-bottom: 10px;
@ -12,7 +12,10 @@
display: table; display: table;
word-wrap: break-word; word-wrap: break-word;
max-width: 100%; max-width: 100%;
border-width: 1px;
border-radius: 5px; border-radius: 5px;
border-style: solid;
border-color: #666;
} }
.ns-alert { .ns-alert {