Merge branch 'master' into develop

This commit is contained in:
ntr
2019-07-16 18:11:53 +10:00
16 changed files with 195 additions and 136 deletions
+4 -4
View File
@@ -146,7 +146,7 @@ button, input {
color: whitesmoke;
height: auto;
border-width: 2px;
border-color: #444;
border-color: #222;
border-radius: 0;
letter-spacing: 0.25em;
box-sizing: border-box;
@@ -299,13 +299,13 @@ button[disabled] {
}
#mnml input, #mnml select {
border-color: #444;
background-color: #333;
border-color: #222;
background-color: #222;
border-radius: 0;
}
#mnml input:focus, #mnml select:focus {
border-color: whitesmoke;
border-color: #888;
}
/*
+2 -2
View File
@@ -4,9 +4,9 @@
"description": "",
"main": "index.js",
"scripts": {
"start": "parcel watch index.html --out-dir /var/lib/mnml/public/dist",
"start": "parcel watch index.html --out-dir /var/lib/mnml/public/current",
"anims": "parcel animations.html --host 0.0.0.0 --port 40080 --no-source-maps",
"build": "parcel build index.html --out-dir /var/lib/mnml/public/dist",
"build": "parcel build index.html",
"scss": "node-sass --watch assets/scss -o assets/styles",
"lint": "eslint --fix --ext .jsx src/",
"test": "echo \"Error: no test specified\" && exit 1"