Merge branch 'feature/stylelint' into develop

This commit is contained in:
shibafu 2019-03-10 20:44:23 +09:00
commit 1fb4352e48
4 changed files with 1521 additions and 39 deletions

View File

@ -57,6 +57,12 @@ jobs:
- store_test_results: - store_test_results:
path: /tmp/php-cs-fixer path: /tmp/php-cs-fixer
# Run stylelint
- run:
name: stylelint
command: yarn run stylelint
when: always
# Run unit test # Run unit test
- run: - run:
command: | command: |

View File

@ -7,22 +7,38 @@
"watch-poll": "npm run watch -- --watch-poll", "watch-poll": "npm run watch -- --watch-poll",
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production", "prod": "npm run production",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"stylelint": "stylelint resources/assets/sass/*"
}, },
"devDependencies": { "devDependencies": {
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"cal-heatmap": "^3.3.10", "cal-heatmap": "^3.3.10",
"chart.js": "^2.7.1", "chart.js": "^2.7.1",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"husky": "^1.3.1",
"jquery": "^3.2.1", "jquery": "^3.2.1",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"laravel-mix": "^4.0.0", "laravel-mix": "^4.0.0",
"laravel-mix-bundle-analyzer": "^1.0.2", "laravel-mix-bundle-analyzer": "^1.0.2",
"lint-staged": "^8.1.5",
"open-iconic": "^1.1.1", "open-iconic": "^1.1.1",
"popper.js": "^1.14.7", "popper.js": "^1.14.7",
"resolve-url-loader": "^2.3.1", "resolve-url-loader": "^2.3.1",
"sass": "^1.17.0", "sass": "^1.17.0",
"sass-loader": "^7.1.0", "sass-loader": "^7.1.0",
"stylelint": "^9.10.1",
"stylelint-config-recess-order": "^2.0.1",
"vue-template-compiler": "^2.6.6" "vue-template-compiler": "^2.6.6"
},
"stylelint": {
"extends": "stylelint-config-recess-order"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.{css,scss}": ["stylelint --fix", "git add"]
} }
} }

View File

@ -1,10 +1,10 @@
@charset "UTF-8"; @charset "UTF-8";
.tis-footer { .tis-footer {
color: #a2a2a2;
font-size: small; font-size: small;
border-top: 1px solid #eee; color: #a2a2a2;
background: linear-gradient(to bottom, #f8f9fa, #fff) background: linear-gradient(to bottom, #f8f9fa, #fff);
border-top: 1px solid #eee
} }
.tis-contribution-graph { .tis-contribution-graph {
@ -12,8 +12,8 @@
} }
.tis-need-agecheck .container { .tis-need-agecheck .container {
filter: blur(45px);
pointer-events: none; pointer-events: none;
filter: blur(45px);
} }
.container { .container {
@ -21,8 +21,8 @@
} }
.list-group-item.no-side-border { .list-group-item.no-side-border {
border-left: none;
border-right: none; border-right: none;
border-left: none;
border-radius: 0; border-radius: 0;
} }
@ -31,8 +31,8 @@
} }
.list-group-item.border-bottom-only { .list-group-item.border-bottom-only {
border-left: none;
border-right: none; border-right: none;
border-left: none;
border-radius: 0; border-radius: 0;
} }
@ -50,12 +50,12 @@
} }
.tis-page-selector { .tis-page-selector {
margin-left: -1px;
width: calc(100% + 2px); width: calc(100% + 2px);
height: 100%; height: 100%;
margin-left: -1px;
line-height: 1.25;
border: 1px solid #dee2e6; border: 1px solid #dee2e6;
border-radius: 0; border-radius: 0;
line-height: 1.25;
} }
@media (min-width: 992px) { @media (min-width: 992px) {
@ -65,13 +65,13 @@
} }
#navbarNav > .d-lg-none > .row > div:first-of-type { #navbarNav > .d-lg-none > .row > div:first-of-type {
padding-left: 15px;
padding-right: 7.5px; padding-right: 7.5px;
padding-left: 15px;
} }
#navbarNav > .d-lg-none > .row > div { #navbarNav > .d-lg-none > .row > div {
padding-left: 7.5px;
padding-right: 15px; padding-right: 15px;
padding-left: 7.5px;
} }
#navbarNav > .d-lg-none > .row > .col .btn { #navbarNav > .d-lg-none > .row > .col .btn {

1516
yarn.lock

File diff suppressed because it is too large Load Diff