diff --git a/.stylelintrc.json b/.stylelintrc.json index 58cfd6b..792af03 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -246,7 +246,24 @@ "scss/dollar-variable-pattern": "^([a-z][a-z0-9]*)(-[a-z0-9]+)*$", "scss/load-partial-extension": "never", "scss/no-duplicate-mixins": true, - "@apostrophecms/stylelint-no-mixed-decls": true + "@apostrophecms/stylelint-no-mixed-decls": [ + true, + { + "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" + ] + } + ] }, "overrides": [ { diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c89c33..8e39ddc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## UNRELEASED + +### Changed + +* Add global mixins to the `@apostrophecms/stylelint-no-mixed-decls` plugin configuration. + ## 4.3.0 (2025-06-11) ### Changed diff --git a/package.json b/package.json index fd78fa1..4e9897f 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "stylelint": ">= 16.1.0" }, "dependencies": { - "@apostrophecms/stylelint-no-mixed-decls": "^1.0.0", + "@apostrophecms/stylelint-no-mixed-decls": "^1.2.0", "stylelint-config-html": "^1.1.0", "stylelint-config-standard": "^36.0.0", "stylelint-declaration-strict-value": "^1.10.7", @@ -41,4 +41,4 @@ "mocha": "^10.2.0", "postcss-scss": "^4.0.9" } -} \ No newline at end of file +}