Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configuration/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ The following properties can be configured, place them above the modules item:
| `units` | The units that will be used in the default weather modules. Possible values are `metric` or `imperial`. | `metric` |
| `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). This will most likely be used in advanced installations, below. | [] |
| `electronSwitches` | An optional array of Electron switches. This allows configuration of electron app itself. <br> This properties will not affect the `serveronly` mode. Usually normal `MM` users don't need this property, but if you are a hard-core hacker, you might need this to handle Electron itself over `MagicMirror` provides. More options can be found [here](https://www.electronjs.org/docs/latest/api/command-line-switches) (Not all available switches are described there.)<br>example:`electronSwitches:["enable-transparent-visuals", "disable-gpu"];` | [] |
| `customCss` | The path of the `custom.css` stylesheet. The default is `css/custom.css`. | `css/custom.css` |
| `watchTargets` | An optional array of file paths to monitor when using `node --run server:watch`. When any of these files change, the server automatically restarts and connected browsers reload. Particularly useful when frequently modifying `config.js`, `custom.css`, or module files during development or setup. Example: `watchTargets: ["config/config.js", "css/custom.css", "modules/MMM-MyModule/MMM-MyModule.js"]`. See [Development Mode](/core-development/debugging.md#watch-mode-with-auto-reload) for more details. | `undefined` |
| `customCss` | The path of the `custom.css` stylesheet. The default is `config/custom.css`. | `config/custom.css` |
| `watchTargets` | An optional array of file paths to monitor when using `node --run server:watch`. When any of these files change, the server automatically restarts and connected browsers reload. Particularly useful when frequently modifying `config.js`, `custom.css`, or module files during development or setup. Example: `watchTargets: ["config/config.js", "config/custom.css", "modules/MMM-MyModule/MMM-MyModule.js"]`. See [Development Mode](/core-development/debugging.md#watch-mode-with-auto-reload) for more details. | `undefined` |

After the above options, you will then add modules. See
[module configuration](/modules/configuration.md) for more information.
Expand Down
2 changes: 1 addition & 1 deletion core-development/debugging.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ property:
let config = {
watchTargets: [
"config/config.js",
"css/custom.css",
"config/custom.css",
"modules/MMM-MyModule/MMM-MyModule.js",
"modules/MMM-MyModule/node_helper.js",
],
Expand Down
2 changes: 1 addition & 1 deletion modules/clock.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ Current notifications are:
| `CLOCK_SECOND` | A second has elapsed. <br> _Parameter_: second value |
| `CLOCK_MINUTE` | A minute has elapsed <br> _Parameter_: minute value |

## styles for clock hands (analog) and text (digital) can be found in clock_style.css, use css/custom.css to override
## styles for clock hands (analog) and text (digital) can be found in clock_style.css, use `config/custom.css` to override
2 changes: 1 addition & 1 deletion modules/customcss.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Custom CSS

MagicMirror² comes with a default theme but it can be customized by placing a
custom css-file in `css/custom.css`.
custom css-file in `config/custom.css`.

### Example

Expand Down