Merge remote-tracking branch 'origin/master' into 007-rollsLib

This commit is contained in:
Oliver Rümpelein 2020-12-30 23:57:00 +01:00
commit dcf60ef59e
2 changed files with 5 additions and 4 deletions

View file

@ -13,7 +13,8 @@
"lint": "eslint 'src/**/*.ts' --cache",
"lint:fix": "eslint 'src/**/*.ts' --cache --fix",
"test": "ts-node ./node_modules/jasmine/bin/jasmine",
"test:ci": "ts-node ./node_modules/jasmine-xml-reporter/bin/jasmine --junitreport"
"test:ci": "ts-node ./node_modules/jasmine-xml-reporter/bin/jasmine --junitreport",
"format": "prettier --write 'src/**/*.(ts|json|scss)'"
},
"author": "",
"license": "",
@ -50,6 +51,7 @@
}
},
"lint-staged": {
"*.ts": "eslint --cache --fix"
"*.ts": "eslint --cache --fix",
"*.(json|scss)": "prettier --write"
}
}

View file

@ -51,7 +51,6 @@
margin-top: 0px;
padding-top: 0px;
}
}
}