From 67eb1fd5a153f62d2e4c6b029dfca7cc3b08d696 Mon Sep 17 00:00:00 2001 From: Volpeon Date: Wed, 17 Mar 2021 18:04:21 +0100 Subject: Merge duplicate trees by default --- src/_props.scss | 8 ++++---- 1 file 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; /// /// @param {map} $map - Map containing properties /// @param {string} $tree [$iro-props-default-tree] - ID the map is saved as -/// @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. +/// @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. /// -@mixin iro-props-store($map, $tree: $iro-props-default-tree, $merge: false, $global: false) { +@mixin iro-props-store($map, $tree: $iro-props-default-tree, $merge: true, $global: false) { $noop: iro-props-store($map, $tree, $merge, $global); } @@ -103,9 +103,9 @@ $iro-props-namespace-context-id: 'namespace' !default; /// /// @param {map} $map - Map containing properties /// @param {string} $tree [$iro-props-default-tree] - ID the map is saved as -/// @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. +/// @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. /// -@function iro-props-store($map, $tree: $iro-props-default-tree, $merge: false, $global: false) { +@function iro-props-store($map, $tree: $iro-props-default-tree, $merge: true, $global: false) { $prop-map: null; @if $iro-props-enforce-double-dashes { -- cgit v1.2.3-54-g00ecf