Skip to content

Commit d72d6d9

Browse files
committed
Merge pull request #16 from MichMich/v2-beta
Update form Master
2 parents aba0b29 + 4ae034b commit d72d6d9

93 files changed

Lines changed: 3345 additions & 16878 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CONTRIBUTING.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
Contribution Policy for MagicMirror²
2+
====================================
3+
4+
Thanks for contributing to MagicMirror²!
5+
6+
We hold our code to standard, and these standards are documented below.
7+
8+
First, before you run the linters, you will need to install them all **and** install the development dependencies:
9+
10+
```bash
11+
(sudo) npm install -g jscs stylelint html-validator-cli
12+
npm install
13+
```
14+
15+
### JavaScript: Run JSCS and ESLint
16+
17+
We use [JSCS](http://jscs.info) and [ESLint](http://eslint.org) on our JavaScript files.
18+
19+
Our JSCS configuration is in our .jscsrc file, and we use [eslint-config-google](https://www.npmjs.com/package/eslint-config-google) in ESLint.
20+
21+
To run ESLint, use `npm run eslint`. To run JSCS, use `npm run jscs`.
22+
23+
### CSS: Run StyleLint
24+
25+
We use [StyleLint](http://stylelint.io) to lint our CSS. Our configuration is in our .stylelintrc file.
26+
27+
To run StyleLint, use `npm run stylelint`.
28+
29+
### HTML: Run HTML Validator
30+
31+
We use [NU Validator](https://validator.w3.org/nu) to validate our HTML. The configuration is in the command in the package.json file.
32+
33+
To run HTML Validator, use `npm run htmlvalidator`.

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
* **Platform** [ Raspberry Pi 2/3, Windows, Mac OS X, Linux]:
2+
* **Node Version** [ 0.12.13 or later ]:

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
* Does the pull request solve a **related** issue? [yes | no]
2+
3+
* If so, can you reference the issue?
4+
5+
* What does the pull request accomplish? (please list)

.github/header.png

14.8 KB
Loading

.github/header.psd

220 KB
Binary file not shown.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# Ignore all modules except the default modules.
99
/modules/**
1010
!/modules/default/**
11+
!/modules/README.md**
1112

1213
# Ignore changes to the custom css files.
1314
/css/custom.css

.jscsrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"preset": "google",
3+
"validateIndentation": "\t",
4+
"validateQuoteMarks": "\"",
5+
"maximumLineLength": 250,
6+
"requireCurlyBraces": [],
7+
"requireCamelCaseOrUpperCaseIdentifiers": false
8+
}

.snyk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
version: v1

.stylelintrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"extends": "stylelint-config-standard",
3+
"font-family-name-quotes": "double-where-recommended"
4+
}

LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)