diff options
| author | Volpeon <git@volpeon.ink> | 2021-03-17 18:04:21 +0100 |
|---|---|---|
| committer | Volpeon <git@volpeon.ink> | 2021-03-17 18:04:21 +0100 |
| commit | 67eb1fd5a153f62d2e4c6b029dfca7cc3b08d696 (patch) | |
| tree | 83597a8474a6c18d5c73bd1324adfc4feb9eef78 | |
| parent | Fix (diff) | |
| download | iro-sass-67eb1fd5a153f62d2e4c6b029dfca7cc3b08d696.tar.gz iro-sass-67eb1fd5a153f62d2e4c6b029dfca7cc3b08d696.tar.bz2 iro-sass-67eb1fd5a153f62d2e4c6b029dfca7cc3b08d696.zip | |
Merge duplicate trees by default
| -rw-r--r-- | src/_props.scss | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/_props.scss b/src/_props.scss index 3e974ab..25d3bf3 100644 --- a/src/_props.scss +++ b/src/_props.scss | |||
| @@ -92,9 +92,9 @@ $iro-props-namespace-context-id: 'namespace' !default; | |||
| 92 | /// | 92 | /// |
| 93 | /// @param {map} $map - Map containing properties | 93 | /// @param {map} $map - Map containing properties |
| 94 | /// @param {string} $tree [$iro-props-default-tree] - ID the map is saved as | 94 | /// @param {string} $tree [$iro-props-default-tree] - ID the map is saved as |
| 95 | /// @param {bool} $merge [false] - If a tree named $tree already exists and this value is set to true, they will be merged. Otherwise an error will be emitted. | 95 | /// @param {bool} $merge [true] - If a tree named $tree already exists and this value is set to true, they will be merged. Otherwise an error will be emitted. |
| 96 | /// | 96 | /// |
| 97 | @mixin iro-props-store($map, $tree: $iro-props-default-tree, $merge: false, $global: false) { | 97 | @mixin iro-props-store($map, $tree: $iro-props-default-tree, $merge: true, $global: false) { |
| 98 | $noop: iro-props-store($map, $tree, $merge, $global); | 98 | $noop: iro-props-store($map, $tree, $merge, $global); |
| 99 | } | 99 | } |
| 100 | 100 | ||
| @@ -103,9 +103,9 @@ $iro-props-namespace-context-id: 'namespace' !default; | |||
| 103 | /// | 103 | /// |
| 104 | /// @param {map} $map - Map containing properties | 104 | /// @param {map} $map - Map containing properties |
| 105 | /// @param {string} $tree [$iro-props-default-tree] - ID the map is saved as | 105 | /// @param {string} $tree [$iro-props-default-tree] - ID the map is saved as |
| 106 | /// @param {bool} $merge [false] - If a tree named $tree already exists and this value is set to true, they will be merged. Otherwise an error will be emitted. | 106 | /// @param {bool} $merge [true] - If a tree named $tree already exists and this value is set to true, they will be merged. Otherwise an error will be emitted. |
| 107 | /// | 107 | /// |
| 108 | @function iro-props-store($map, $tree: $iro-props-default-tree, $merge: false, $global: false) { | 108 | @function iro-props-store($map, $tree: $iro-props-default-tree, $merge: true, $global: false) { |
| 109 | $prop-map: null; | 109 | $prop-map: null; |
| 110 | 110 | ||
| 111 | @if $iro-props-enforce-double-dashes { | 111 | @if $iro-props-enforce-double-dashes { |