@ulu/frontend 0.1.0-beta.44 → 0.1.0-beta.45
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/package.json +1 -1
- package/scss/_element.scss +3 -2
- package/scss/_units.scss +3 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
+
## Version 0.1.0-beta.45
|
|
4
|
+
|
|
5
|
+
- **scss/units > set()**
|
|
6
|
+
- Adjust to use map-merge so you can configure how the map is merged (ie. overwrite for example)
|
|
7
|
+
- **scss/element > set-rule-margins()**
|
|
8
|
+
- Adjust to use map-merge so you can configure how the map is merged (ie. overwrite for example)
|
|
9
|
+
|
|
3
10
|
## Version 0.1.0-beta.44
|
|
4
11
|
|
|
5
12
|
- **scss/components/card**
|
package/package.json
CHANGED
package/scss/_element.scss
CHANGED
|
@@ -116,9 +116,10 @@ $rule-margins: (
|
|
|
116
116
|
|
|
117
117
|
/// Sets rule margins
|
|
118
118
|
/// @param {Map} $changes Map of changes
|
|
119
|
+
/// @param {String} $merge-mode Merge mode see utils.map-merge() [null|"deep"|"overwrite"]
|
|
119
120
|
|
|
120
|
-
@mixin set-rule-margins($changes) {
|
|
121
|
-
$rule-margins: map
|
|
121
|
+
@mixin set-rule-margins($changes, $merge-mode: null) {
|
|
122
|
+
$rule-margins: utils.map-merge($rule-margins, $changes, $merge-mode) !global;
|
|
122
123
|
}
|
|
123
124
|
|
|
124
125
|
/// Get a rule style
|
package/scss/_units.scss
CHANGED
|
@@ -27,13 +27,14 @@ $config: (
|
|
|
27
27
|
|
|
28
28
|
/// Update the units config
|
|
29
29
|
/// @param {Map} $changes A map to merge into the color palette
|
|
30
|
+
/// @param {String} $merge-mode Merge mode see utils.map-merge() [null|"deep"|"overwrite"]
|
|
30
31
|
/// @example scss Setting the error and type color
|
|
31
32
|
/// @include ulu.units-set((
|
|
32
33
|
/// "default" : 1.5em
|
|
33
34
|
/// ));
|
|
34
35
|
|
|
35
|
-
@mixin set($changes) {
|
|
36
|
-
$config: map
|
|
36
|
+
@mixin set($changes, $merge-mode: null) {
|
|
37
|
+
$config: utils.map-merge($config, $changes, $merge-mode) !global;
|
|
37
38
|
}
|
|
38
39
|
|
|
39
40
|
/// Get a unit by name (preset) or number (multiplier of base)
|