Remove husky

This commit is contained in:
Chocobozzz 2020-01-21 14:28:28 +01:00
parent f0ad471007
commit a3705089fa
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
8 changed files with 603 additions and 721 deletions

View File

@ -1,9 +1,9 @@
files:
include: "**/*.s+(a|c)ss"
ignore: [
"node_modules/**/*.*",
"client/node_modules/**/*.*"
]
include:
- "src/app/**/*.scss"
- "src/assets/**/*.scss"
- "src/sass/**/*.scss"
- "src/standalone/**/*.scss"
syntax:
include:
- scss

View File

@ -13,14 +13,17 @@
"url": "git+https://github.com/Chocobozzz/PeerTube.git"
},
"scripts": {
"lint": "tslint --project ./tsconfig.json -c ./tslint.json 'src/app/**/*.ts' 'src/standalone/**/*.ts'",
"lint": "npm run lint-ts && npm run lint-scss",
"lint-ts": "tslint --project ./tsconfig.json -c ./tslint.json 'src/app/**/*.ts' 'src/standalone/**/*.ts'",
"lint-scss": "sass-lint -c .sass-lint.yml",
"webpack": "webpack",
"tslint": "tslint",
"ng": "ng",
"postinstall": "npm rebuild node-sass",
"webpack-bundle-analyzer": "webpack-bundle-analyzer",
"webdriver-manager": "webdriver-manager",
"ngx-extractor": "ngx-extractor"
"ngx-extractor": "ngx-extractor",
"sass-lint": "sass-lint"
},
"typings": "*.d.ts",
"resolutions": {
@ -112,6 +115,7 @@
"raw-loader": "^1",
"rxjs": "^6.5.2",
"sanitize-html": "^1.18.4",
"sass-lint": "^1.13.1",
"sass-loader": "7",
"sass-resources-loader": "^2.0.0",
"socket.io-client": "^2.2.0",

View File

@ -10,8 +10,12 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
}
@keyframes spin {
from { transform: scale(1) rotate(0deg);}
to { transform: scale(1) rotate(360deg);}
from {
transform: scale(1) rotate(0deg);
}
to {
transform: scale(1) rotate(360deg);
}
}
.dropdown-menu {
@ -38,7 +42,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
}
@media screen and (min-width: 768px) {
@media screen and (min-width: 768px) {
.modal:before {
display: inline-block;
vertical-align: middle;
@ -172,9 +176,9 @@ ngb-modal-backdrop {
}
.btn-outline-tertiary {
color: var(--secondaryColor);
color: var(--secondaryColor);
border-color: var(--secondaryColor);
&:hover {
color: var(--mainBackgroundColor);
background-color: var(--secondaryColor);

View File

@ -9,25 +9,25 @@
}
.vjs-bezel {
position: absolute;
left: 50%;
top: 50%;
width: 52px;
height: 52px;
z-index: 19;
margin-left: -26px;
margin-top: -26px;
background: rgba(0,0,0,.5);
border-radius: 26px;
animation: bezels-fadeout .5s linear 1 normal forwards;
position: absolute;
left: 50%;
top: 50%;
width: 52px;
height: 52px;
z-index: 19;
margin-left: -26px;
margin-top: -26px;
background: rgba(0, 0, 0, .5);
border-radius: 26px;
animation: bezels-fadeout .5s linear 1 normal forwards;
pointer-events: none;
}
.vjs-bezel-icon {
width: 36px;
height: 36px;
width: 36px;
height: 36px;
margin: 8px;
svg .vjs-svg-fill {
fill: #fff;
}
@ -39,4 +39,4 @@
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -74,26 +74,9 @@
"release": "scripty",
"release-embed-api": "scripty",
"nightly": "scripty",
"client-report": "scripty"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.scss": [
"sass-lint -c client/.sass-lint.yml",
"git add"
],
"support/doc/api/*.yaml": [
"node ./node_modules/swagger-cli/bin/swagger-cli.js validate support/doc/api/openapi.yaml",
"git add"
],
"server/tools/README.md": [
"npm run generate-cli-doc",
"git add"
]
"client-report": "scripty",
"swagger-cli": "swagger-cli",
"sass-lint": "sass-lint"
},
"resolutions": {
"@types/bluebird": "3.5.27"
@ -205,7 +188,6 @@
"chai-json-schema": "^1.5.0",
"chai-xml": "^0.3.2",
"concurrently": "^5.0.0",
"husky": "^4.0.0",
"libxmljs": "0.19.7",
"lint-staged": "^9.2.0",
"maildev": "^1.0.0-rc3",
@ -213,7 +195,6 @@
"mocha": "^7.0.0",
"mocha-parallel-tests": "^2.2.1",
"nodemon": "^2.0.1",
"sass-lint": "^1.12.1",
"source-map-support": "^0.5.0",
"supertest": "^4.0.2",
"swagger-cli": "^2.2.0",

View File

@ -34,6 +34,7 @@ elif [ "$1" = "api-4" ]; then
sh ./server/tests/api/ci-4.sh 2
elif [ "$1" = "lint" ]; then
npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
npm run swagger-cli -- validate support/doc/api/openapi.yaml
( cd client
npm run lint

677
yarn.lock

File diff suppressed because it is too large Load Diff