diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e44cad85..ea562f2d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ ### Maintenance - Use the pre-built database images for MySQL and PostgreSQL tests [#1204](https://github.com/nextcloud/cookbook/pull/1204) @christianlupus +- Update stylelint-config-idiomatic and fix code styling + [#1224](https://github.com/nextcloud/cookbook/pull/1224) @christianlupus ### Removed - Remove the deprecated endpoints from version 0.9.15 diff --git a/package-lock.json b/package-lock.json index 52ff28000..4260159bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "prettier": "^2.2.1", "prettier-package-json": "^2.6.3", "stylelint": "^14.5.3", - "stylelint-config-idiomatic-order": "^8.1.0", + "stylelint-config-idiomatic-order": "^9.0.0", "stylelint-config-prettier": "^9.0.3", "stylelint-scss": "^4.1.0", "svg-inline-loader": "^0.8.2", @@ -7309,39 +7309,12 @@ } }, "node_modules/postcss-sorting": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-5.0.1.tgz", - "integrity": "sha512-Y9fUFkIhfrm6i0Ta3n+89j56EFqaNRdUKqXyRp6kvTcSXnmgEjaVowCXH+JBe9+YKWqd4nc28r2sgwnzJalccA==", - "dev": true, - "dependencies": { - "lodash": "^4.17.14", - "postcss": "^7.0.17" - }, - "engines": { - "node": ">=8.7.0" - } - }, - "node_modules/postcss-sorting/node_modules/picocolors": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", - "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", - "dev": true - }, - "node_modules/postcss-sorting/node_modules/postcss": { - "version": "7.0.39", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", - "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz", + "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==", "dev": true, - "dependencies": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" + "peerDependencies": { + "postcss": "^8.3.9" } }, "node_modules/postcss-value-parser": { @@ -9074,12 +9047,15 @@ } }, "node_modules/stylelint-config-idiomatic-order": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/stylelint-config-idiomatic-order/-/stylelint-config-idiomatic-order-8.1.0.tgz", - "integrity": "sha512-iTPY6JjbkIdzy+21x3a1xi/tG33zKhLJb6lZl1xg6jZrXjgIYelnRZ5xVtbcEP9rElxZq/Zu1eGthfvI+ri+YQ==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-idiomatic-order/-/stylelint-config-idiomatic-order-9.0.0.tgz", + "integrity": "sha512-+LtfPycY1Paayf1MaERyh6BzVPnZxemX5NtzdUPqi4u8hyAR7859f/4EL02+Kr9va76iX7mbYC4HendocXKJZQ==", "dev": true, "dependencies": { - "stylelint-order": "^3.1.1" + "stylelint-order": "^5.0.0" + }, + "engines": { + "node": ">=12" }, "peerDependencies": { "stylelint": ">=11" @@ -9165,43 +9141,16 @@ } }, "node_modules/stylelint-order": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-3.1.1.tgz", - "integrity": "sha512-4gP/r8j/6JGZ/LL41b2sYtQqfwZl4VSqTp7WeIwI67v/OXNQ08dnn64BGXNwAUSgb2+YIvIOxQaMzqMyQMzoyQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz", + "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==", "dev": true, "dependencies": { - "lodash": "^4.17.15", - "postcss": "^7.0.17", - "postcss-sorting": "^5.0.1" - }, - "engines": { - "node": ">=8.7.0" + "postcss": "^8.3.11", + "postcss-sorting": "^7.0.1" }, "peerDependencies": { - "stylelint": ">=10.0.1" - } - }, - "node_modules/stylelint-order/node_modules/picocolors": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", - "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", - "dev": true - }, - "node_modules/stylelint-order/node_modules/postcss": { - "version": "7.0.39", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", - "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", - "dev": true, - "dependencies": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" + "stylelint": "^14.0.0" } }, "node_modules/stylelint-scss": { @@ -16429,32 +16378,11 @@ } }, "postcss-sorting": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-5.0.1.tgz", - "integrity": "sha512-Y9fUFkIhfrm6i0Ta3n+89j56EFqaNRdUKqXyRp6kvTcSXnmgEjaVowCXH+JBe9+YKWqd4nc28r2sgwnzJalccA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz", + "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==", "dev": true, - "requires": { - "lodash": "^4.17.14", - "postcss": "^7.0.17" - }, - "dependencies": { - "picocolors": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", - "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", - "dev": true - }, - "postcss": { - "version": "7.0.39", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", - "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", - "dev": true, - "requires": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - } - } - } + "requires": {} }, "postcss-value-parser": { "version": "4.2.0", @@ -17826,12 +17754,12 @@ "requires": {} }, "stylelint-config-idiomatic-order": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/stylelint-config-idiomatic-order/-/stylelint-config-idiomatic-order-8.1.0.tgz", - "integrity": "sha512-iTPY6JjbkIdzy+21x3a1xi/tG33zKhLJb6lZl1xg6jZrXjgIYelnRZ5xVtbcEP9rElxZq/Zu1eGthfvI+ri+YQ==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-idiomatic-order/-/stylelint-config-idiomatic-order-9.0.0.tgz", + "integrity": "sha512-+LtfPycY1Paayf1MaERyh6BzVPnZxemX5NtzdUPqi4u8hyAR7859f/4EL02+Kr9va76iX7mbYC4HendocXKJZQ==", "dev": true, "requires": { - "stylelint-order": "^3.1.1" + "stylelint-order": "^5.0.0" } }, "stylelint-config-prettier": { @@ -17886,32 +17814,13 @@ } }, "stylelint-order": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-3.1.1.tgz", - "integrity": "sha512-4gP/r8j/6JGZ/LL41b2sYtQqfwZl4VSqTp7WeIwI67v/OXNQ08dnn64BGXNwAUSgb2+YIvIOxQaMzqMyQMzoyQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz", + "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==", "dev": true, "requires": { - "lodash": "^4.17.15", - "postcss": "^7.0.17", - "postcss-sorting": "^5.0.1" - }, - "dependencies": { - "picocolors": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", - "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", - "dev": true - }, - "postcss": { - "version": "7.0.39", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", - "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", - "dev": true, - "requires": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - } - } + "postcss": "^8.3.11", + "postcss-sorting": "^7.0.1" } }, "stylelint-scss": { diff --git a/package.json b/package.json index 417ae90c1..da5e5c7b6 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "prettier": "^2.2.1", "prettier-package-json": "^2.6.3", "stylelint": "^14.5.3", - "stylelint-config-idiomatic-order": "^8.1.0", + "stylelint-config-idiomatic-order": "^9.0.0", "stylelint-config-prettier": "^9.0.3", "stylelint-scss": "^4.1.0", "svg-inline-loader": "^0.8.2", diff --git a/src/components/EditInputField.vue b/src/components/EditInputField.vue index cef18e44b..7c80f29e8 100644 --- a/src/components/EditInputField.vue +++ b/src/components/EditInputField.vue @@ -214,9 +214,9 @@ See: https://github.com/nextcloud/cookbook/issues/908 min-height: revert; padding: revert; border: revert; + border-radius: revert; margin: revert; background-color: revert; - border-radius: revert; color: revert; font-size: revert; outline: revert; diff --git a/src/components/EditInputGroup.vue b/src/components/EditInputGroup.vue index 79348182a..70992af34 100644 --- a/src/components/EditInputGroup.vue +++ b/src/components/EditInputGroup.vue @@ -466,10 +466,10 @@ li .controls > button { width: 34px; height: 34px; padding: 0; + border-radius: 0; border-right-color: transparent; border-left-color: transparent; margin: 0; - border-radius: 0; } li .controls > button:last-child { @@ -510,10 +510,10 @@ li .controls > button:last-child:not(:hover):not(:focus) { width: 36px; height: 36px; border: 1px solid var(--color-border-dark); + border-radius: 50%; background-color: var(--color-background-dark); background-position: center; background-repeat: no-repeat; - border-radius: 50%; line-height: 36px; outline: none; text-align: center; diff --git a/src/components/RecipeCard.vue b/src/components/RecipeCard.vue index 521deaa2b..3a0ed300c 100644 --- a/src/components/RecipeCard.vue +++ b/src/components/RecipeCard.vue @@ -95,8 +95,8 @@ export default { overflow: hidden; width: 105px; height: 105px; - background-color: #bebdbd; border-radius: 3px 0 0 3px; + background-color: #bebdbd; float: left; } diff --git a/src/components/RecipeInstruction.vue b/src/components/RecipeInstruction.vue index 086cbd679..a1446a978 100644 --- a/src/components/RecipeInstruction.vue +++ b/src/components/RecipeInstruction.vue @@ -46,10 +46,10 @@ li::before { width: 36px; height: 36px; border: 1px solid var(--color-border-dark); + border-radius: 50%; background-color: var(--color-background-dark); background-position: center; background-repeat: no-repeat; - border-radius: 50%; content: counter(instruction-counter); line-height: 36px; outline: none; diff --git a/src/components/RecipeKeyword.vue b/src/components/RecipeKeyword.vue index 964a3d0b8..b75125ab7 100644 --- a/src/components/RecipeKeyword.vue +++ b/src/components/RecipeKeyword.vue @@ -39,9 +39,9 @@ li { display: inline-block; padding: 0 0.5em; border: 1px solid var(--color-border-dark); + border-radius: var(--border-radius-pill); margin-right: 0.3em; margin-bottom: 0.3em; - border-radius: var(--border-radius-pill); /* prevent text selection - doesn't look good */ user-select: none; /* Standard */ diff --git a/src/components/RecipeTimer.vue b/src/components/RecipeTimer.vue index 4716ba083..8d35712a7 100644 --- a/src/components/RecipeTimer.vue +++ b/src/components/RecipeTimer.vue @@ -133,8 +133,8 @@ export default { position: relative; flex-grow: 1; border: 1px solid var(--color-border-dark); - margin: 1rem 2rem; border-radius: 3px; + margin: 1rem 2rem; font-size: 1.2rem; text-align: center; } diff --git a/src/components/RecipeView.vue b/src/components/RecipeView.vue index fa5a1a57a..41d5c91cf 100644 --- a/src/components/RecipeView.vue +++ b/src/components/RecipeView.vue @@ -703,8 +703,8 @@ export default { position: relative; flex-grow: 1; border: 1px solid var(--color-border-dark); - margin: 1rem 2rem; border-radius: 3px; + margin: 1rem 2rem; font-size: 1.2rem; text-align: center; } @@ -836,11 +836,11 @@ main { width: 36px; height: 36px; border: 1px solid var(--color-border-dark); + border-radius: 50%; margin: -6px 1rem 1rem 0; background-color: var(--color-background-dark); background-position: center; background-repeat: no-repeat; - border-radius: 50%; content: counter(instruction-counter); float: left; line-height: 36px; diff --git a/src/components/SuggestionsPopup.vue b/src/components/SuggestionsPopup.vue index 92d09be5b..2e7e4d69d 100644 --- a/src/components/SuggestionsPopup.vue +++ b/src/components/SuggestionsPopup.vue @@ -383,8 +383,8 @@ export default { z-index: 2; overflow: hidden; border: 1px solid var(--color-background-darker); - background-color: var(--color-main-background); border-radius: 5px; + background-color: var(--color-main-background); } .scroller {