kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 21:00:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #558 from roramirez/size-for-compliments-text

Browse Source 
Size for compliments text
This commit is contained in:
Michael Teeuw
2016-12-09 14:54:29 +01:00
committed by GitHub
parent cdf78db629 53d2c7e89f
commit 78aa2b491c
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -31,6 +31,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Added option `remoteFile` to compliments module to load compliment array from filesystem. - Added option `remoteFile` to compliments module to load compliment array from filesystem.
- Added option `zoom` to scale the whole mirror display with a given factor. - Added option `zoom` to scale the whole mirror display with a given factor.
- Added option `roundTemp` for currentweather and weatherforecast modules to display temperatures rounded to nearest integer. - Added option `roundTemp` for currentweather and weatherforecast modules to display temperatures rounded to nearest integer.
- Added abilty set the classes option to compliments module for style and text size of compliments.
### Updated ### Updated
- Modified translations for Frysk. - Modified translations for Frysk.

18
modules/default/compliments/README.md
View File

@@ -57,14 +57,14 @@ The following properties can be configured:
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>remoteFile</code></td> <td><code>remoteFile</code></td>
<td>External file from which to load the compliments<br> <td>External file from which to load the compliments<br>
<br><b>Possible values:</b>Path to a JSON file containing compliments, configured <br><b>Possible values:</b>Path to a JSON file containing compliments, configured
as per the value of the <i>compliments configuration</i> (see below). An object with three arrays: as per the value of the <i>compliments configuration</i> (see below). An object with three arrays:
morning, afternoon and evening. - <code>compliments.json</code> morning, afternoon and evening. - <code>compliments.json</code>
<br><b>Default value:</b> <code>null</code> (Do not load from file) <br><b>Default value:</b> <code>null</code> (Do not load from file)
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@@ -89,7 +89,7 @@ If use the currentweather is possible use a actual weather for set compliments.
* <code>night_rain</code> * <code>night_rain</code>
* <code>night_thunderstorm</code> * <code>night_thunderstorm</code>
* <code>night_snow</code> * <code>night_snow</code>
* <code>night_alt_cloudy_windy<code> * <code>night_alt_cloudy_windy</code>
#### Example use with currentweather module #### Example use with currentweather module
````javascript ````javascript

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

@@ -144,7 +144,7 @@ Module.register("compliments",{
var compliment = document.createTextNode(complimentText); var compliment = document.createTextNode(complimentText);
var wrapper = document.createElement("div"); var wrapper = document.createElement("div");
wrapper.className = "thin xlarge bright"; wrapper.className = this.config.classes ? this.config.classes : "thin xlarge bright";
wrapper.appendChild(compliment); wrapper.appendChild(compliment);
return wrapper; return wrapper;