dungeonslayers/ds4
dungeonslayers/ds4
3
0
Fork 0
Code Issues 9 Pull requests 7 Projects Releases 10 Packages 1 Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -13,7 +13,8 @@
"lint": "eslint 'src/**/*.ts' --cache", "lint": "eslint 'src/**/*.ts' --cache",
"lint:fix": "eslint 'src/**/*.ts' --cache --fix", "lint:fix": "eslint 'src/**/*.ts' --cache --fix",
"test": "ts-node ./node_modules/jasmine/bin/jasmine", "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": "", "author": "",
"license": "", "license": "",
@ -50,6 +51,7 @@
} }
}, },
"lint-staged": { "lint-staged": {
"*.ts": "eslint --cache --fix" "*.ts": "eslint --cache --fix",
"*.(json|scss)": "prettier --write"
} }
} }

3
src/scss/components/_items.scss
View file

@ -51,7 +51,6 @@
margin-top: 0px; margin-top: 0px;
padding-top: 0px; padding-top: 0px;
} }
} }
} }
@ -61,4 +60,4 @@
padding-left: 1em; padding-left: 1em;
border-bottom: 2px groove $c-border-groove; border-bottom: 2px groove $c-border-groove;
font-weight: bold; font-weight: bold;
} }