diff options
| -rw-r--r-- | .stylelintrc.yaml | 4 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | package-lock.json | 53 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | web_src/js/components/RepoActionView.vue | 14 |
5 files changed, 66 insertions, 10 deletions
diff --git a/.stylelintrc.yaml b/.stylelintrc.yaml index 7dad9d0594..a9854de4e8 100644 --- a/.stylelintrc.yaml +++ b/.stylelintrc.yaml @@ -11,6 +11,8 @@ overrides: - files: ["**/chroma/*", "**/codemirror/*"] rules: block-no-empty: null + - files: ["**/*.vue"] + customSyntax: postcss-html rules: alpha-value-notation: null @@ -96,7 +98,7 @@ rules: property-no-vendor-prefix: null rule-empty-line-before: null rule-selector-property-disallowed-list: null - scale-unlimited/declaration-strict-value: [[color, background-color, border-color, font-weight], {ignoreValues: /^(inherit|transparent|unset|initial|currentcolor|none)$/, ignoreFunctions: false}] + scale-unlimited/declaration-strict-value: [[color, background-color, border-color, font-weight], {ignoreValues: /^(inherit|transparent|unset|initial|currentcolor|none)$/, ignoreFunctions: false, disableFix: true}] selector-attribute-name-disallowed-list: null selector-attribute-operator-allowed-list: null selector-attribute-operator-disallowed-list: null @@ -372,11 +372,11 @@ lint-js-fix: node_modules .PHONY: lint-css lint-css: node_modules - npx stylelint --color --max-warnings=0 web_src/css + npx stylelint --color --max-warnings=0 web_src/css web_src/js/components/*.vue .PHONY: lint-css-fix lint-css-fix: node_modules - npx stylelint --color --max-warnings=0 web_src/css --fix + npx stylelint --color --max-warnings=0 web_src/css web_src/js/components/*.vue --fix .PHONY: lint-swagger lint-swagger: node_modules diff --git a/package-lock.json b/package-lock.json index a28539c571..61f83e1beb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,6 +74,7 @@ "eslint-plugin-wc": "1.5.0", "jsdom": "22.0.0", "markdownlint-cli": "0.34.0", + "postcss-html": "1.5.0", "stylelint": "15.6.2", "stylelint-declaration-strict-value": "1.9.2", "svgo": "3.0.2", @@ -5679,6 +5680,37 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/htmlparser2": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", + "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", + "dev": true, + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "entities": "^4.4.0" + } + }, + "node_modules/htmlparser2/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", @@ -7871,6 +7903,27 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/postcss-html": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.5.0.tgz", + "integrity": "sha512-kCMRWJRHKicpA166kc2lAVUGxDZL324bkj/pVOb6RhjB0Z5Krl7mN0AsVkBhVIRZZirY0lyQXG38HCVaoKVNoA==", + "dev": true, + "dependencies": { + "htmlparser2": "^8.0.0", + "js-tokens": "^8.0.0", + "postcss": "^8.4.0", + "postcss-safe-parser": "^6.0.0" + }, + "engines": { + "node": "^12 || >=14" + } + }, + "node_modules/postcss-html/node_modules/js-tokens": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-8.0.1.tgz", + "integrity": "sha512-3AGrZT6tuMm1ZWWn9mLXh7XMfi2YtiLNPALCVxBCiUVq0LD1OQMxV/AdS/s7rLJU5o9i/jBZw/N4vXXL5dm29A==", + "dev": true + }, "node_modules/postcss-media-query-parser": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", diff --git a/package.json b/package.json index e33e013cf8..934353ed8a 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "eslint-plugin-wc": "1.5.0", "jsdom": "22.0.0", "markdownlint-cli": "0.34.0", + "postcss-html": "1.5.0", "stylelint": "15.6.2", "stylelint-declaration-strict-value": "1.9.2", "svgo": "3.0.2", diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index b2fd63dd18..da05491146 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -429,7 +429,7 @@ export function ansiLogToHTML(line) { /* action view header */ .action-view-header { - margin: 20px 0px; + margin: 20px 0; } .action-info-summary { @@ -452,7 +452,7 @@ export function ansiLogToHTML(line) { .action-commit-summary { display: flex; gap: 5px; - margin: 10px 0px 10px 25px; + margin: 10px 0 10px 25px; } /* ================ */ @@ -472,7 +472,7 @@ export function ansiLogToHTML(line) { .job-artifacts-title { font-size: 18px; margin-top: 16px; - padding: 16px 10px 0px 20px; + padding: 16px 10px 0 20px; border-top: 1px solid var(--color-secondary); } @@ -639,8 +639,8 @@ export function ansiLogToHTML(line) { } .job-step-section .job-step-logs { - font-family: monospace, monospace; - margin: 8px 0px; + font-family: monospace; + margin: 8px 0; font-size: 12px; } @@ -673,7 +673,7 @@ export function ansiLogToHTML(line) { margin-left: 10px; } -/* TODO: group support */ +/* TODO: group support .job-log-group { @@ -683,5 +683,5 @@ export function ansiLogToHTML(line) { } .job-log-list { -} +} */ </style> |