Merge pull request #895 from JanLoebel/develop

#891 Added ability to change the custom.css path.
This commit is contained in:
Michael Teeuw 2017-06-03 19:10:45 +02:00 committed by GitHub
commit ca92a0af5c
4 changed files with 4 additions and 2 deletions

View File

@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Add test for check if exits the directories present in defaults modules. - Add test for check if exits the directories present in defaults modules.
- Add calendar option to set a separate date format for full day events. - Add calendar option to set a separate date format for full day events.
- Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification - Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification
- Add ability to change the path of the `custom.css`.
### Updated ### Updated
- Added missing keys to Polish translation. - Added missing keys to Polish translation.

View File

@ -124,7 +124,7 @@ The following properties can be configured:
| `units` | The units that will be used in the default weather modules. Possible values are `metric` or `imperial`. The default is `metric`. | | `units` | The units that will be used in the default weather modules. Possible values are `metric` or `imperial`. The default is `metric`. |
| `modules` | An array of active modules. **The array must contain objects. See the next table below for more information.** | | `modules` | An array of active modules. **The array must contain objects. See the next table below for more information.** |
| `electronOptions` | An optional array of Electron (browser) options. This allows configuration of e.g. the browser screen size and position (example: `electronOptions: { fullscreen: false, width: 800, height: 600 }`). Kiosk mode can be enabled by setting `kiosk = true`, `autoHideMenuBar = false` and `fullscreen = false`. More options can be found [here](https://github.com/electron/electron/blob/master/docs/api/browser-window.md). | | `electronOptions` | An optional array of Electron (browser) options. This allows configuration of e.g. the browser screen size and position (example: `electronOptions: { fullscreen: false, width: 800, height: 600 }`). Kiosk mode can be enabled by setting `kiosk = true`, `autoHideMenuBar = false` and `fullscreen = false`. More options can be found [here](https://github.com/electron/electron/blob/master/docs/api/browser-window.md). |
| `customCss` | The path of the `custom.css` stylesheet. The default is `css/custom.css`. |
Module configuration: Module configuration:

View File

@ -21,6 +21,7 @@ var defaults = {
timeFormat: 24, timeFormat: 24,
units: "metric", units: "metric",
zoom: 1, zoom: 1,
customCss: "css/custom.css",
modules: [ modules: [
{ {

View File

@ -35,7 +35,7 @@ var Loader = (function() {
// This is done after all the modules so we can // This is done after all the modules so we can
// overwrite all the defined styles. // overwrite all the defined styles.
loadFile("css/custom.css", function() { loadFile(config.customCss, function() {
// custom.css loaded. Start all modules. // custom.css loaded. Start all modules.
startModules(); startModules();
}); });