From 38709a58bd1fa5df8ccc6d7227288a9ed507c162 Mon Sep 17 00:00:00 2001 From: Etienne Laurent Date: Tue, 26 Aug 2025 14:20:32 +0200 Subject: [PATCH 1/3] fix stylelint errors and upgrade @apostrophecms/stylelint-no-mixed-decls --- .stylelintrc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.stylelintrc b/.stylelintrc index 827def6aa4..3e147f7db4 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,3 +1,11 @@ { - "extends": "stylelint-config-apostrophe" + "extends": "stylelint-config-apostrophe", + "rules": { + "@apostrophecms/stylelint-no-mixed-decls": [ + true, + { + "contain-nested": ["apos-transition"] + } + ] + } } From 6e8726eddda9ea8956b3bd766434c87e719598bf Mon Sep 17 00:00:00 2001 From: Etienne Laurent Date: Wed, 10 Sep 2025 15:11:15 +0200 Subject: [PATCH 2/3] add spaces --- .stylelintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.stylelintrc b/.stylelintrc index 3e147f7db4..77341762d0 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -4,7 +4,7 @@ "@apostrophecms/stylelint-no-mixed-decls": [ true, { - "contain-nested": ["apos-transition"] + "contain-nested": [ "apos-transition" ] } ] } From 533ce055c364e2d3374148396cbe0fc90b64209e Mon Sep 17 00:00:00 2001 From: Etienne Laurent Date: Wed, 10 Sep 2025 16:48:53 +0200 Subject: [PATCH 3/3] add mixins known to contain nested rules --- .stylelintrc | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.stylelintrc b/.stylelintrc index 77341762d0..842220d3e8 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -4,7 +4,19 @@ "@apostrophecms/stylelint-no-mixed-decls": [ true, { - "contain-nested": [ "apos-transition" ] + "contain-nested": [ + "type-base", + "type-help", + "type-small", + "type-label", + "type-large", + "type-title", + "type-display", + "apos-input", + "link-primary", + "apos-transition", + "apos-button-reset" + ] } ] }