@micromag/core 0.3.429 → 0.3.432
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/assets/css/styles.css +1 -1
- package/assets/css/vendor.css +3 -2
- package/es/utils.js +10 -3
- package/lib/utils.js +10 -3
- package/package.json +2 -2
- package/scss/upload.scss +1 -2
- package/scss/vendor.scss +3 -1
package/es/utils.js
CHANGED
|
@@ -568,7 +568,7 @@ var largestRemainderRound = function largestRemainderRound(numbers, desiredTotal
|
|
|
568
568
|
});
|
|
569
569
|
};
|
|
570
570
|
|
|
571
|
-
var _excluded = ["image", "video", "media"];
|
|
571
|
+
var _excluded = ["image", "video", "media", "color"];
|
|
572
572
|
var getLayersFromBackground = function getLayersFromBackground() {
|
|
573
573
|
var background = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
|
|
574
574
|
if (background === null) {
|
|
@@ -581,16 +581,23 @@ var getLayersFromBackground = function getLayersFromBackground() {
|
|
|
581
581
|
video = _ref$video === void 0 ? null : _ref$video,
|
|
582
582
|
_ref$media = _ref.media,
|
|
583
583
|
media = _ref$media === void 0 ? null : _ref$media,
|
|
584
|
+
_ref$color = _ref.color,
|
|
585
|
+
color = _ref$color === void 0 ? null : _ref$color,
|
|
584
586
|
data = _objectWithoutProperties(_ref, _excluded);
|
|
587
|
+
if (image === null && video === null && color === null) {
|
|
588
|
+
return layers;
|
|
589
|
+
}
|
|
585
590
|
if (image !== null && video !== null) {
|
|
586
591
|
return [].concat(_toConsumableArray(layers), [_objectSpread({
|
|
587
592
|
media: image
|
|
588
593
|
}, data), _objectSpread({
|
|
589
|
-
media: video
|
|
594
|
+
media: video,
|
|
595
|
+
color: color
|
|
590
596
|
}, data)]);
|
|
591
597
|
}
|
|
592
598
|
return [].concat(_toConsumableArray(layers), [_objectSpread({
|
|
593
|
-
media: media || image || video
|
|
599
|
+
media: media || image || video,
|
|
600
|
+
color: color
|
|
594
601
|
}, data)]);
|
|
595
602
|
}, []);
|
|
596
603
|
};
|
package/lib/utils.js
CHANGED
|
@@ -570,7 +570,7 @@ var largestRemainderRound = function largestRemainderRound(numbers, desiredTotal
|
|
|
570
570
|
});
|
|
571
571
|
};
|
|
572
572
|
|
|
573
|
-
var _excluded = ["image", "video", "media"];
|
|
573
|
+
var _excluded = ["image", "video", "media", "color"];
|
|
574
574
|
var getLayersFromBackground = function getLayersFromBackground() {
|
|
575
575
|
var background = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
|
|
576
576
|
if (background === null) {
|
|
@@ -583,16 +583,23 @@ var getLayersFromBackground = function getLayersFromBackground() {
|
|
|
583
583
|
video = _ref$video === void 0 ? null : _ref$video,
|
|
584
584
|
_ref$media = _ref.media,
|
|
585
585
|
media = _ref$media === void 0 ? null : _ref$media,
|
|
586
|
+
_ref$color = _ref.color,
|
|
587
|
+
color = _ref$color === void 0 ? null : _ref$color,
|
|
586
588
|
data = _objectWithoutProperties(_ref, _excluded);
|
|
589
|
+
if (image === null && video === null && color === null) {
|
|
590
|
+
return layers;
|
|
591
|
+
}
|
|
587
592
|
if (image !== null && video !== null) {
|
|
588
593
|
return [].concat(_toConsumableArray(layers), [_objectSpread({
|
|
589
594
|
media: image
|
|
590
595
|
}, data), _objectSpread({
|
|
591
|
-
media: video
|
|
596
|
+
media: video,
|
|
597
|
+
color: color
|
|
592
598
|
}, data)]);
|
|
593
599
|
}
|
|
594
600
|
return [].concat(_toConsumableArray(layers), [_objectSpread({
|
|
595
|
-
media: media || image || video
|
|
601
|
+
media: media || image || video,
|
|
602
|
+
color: color
|
|
596
603
|
}, data)]);
|
|
597
604
|
}, []);
|
|
598
605
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@micromag/core",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.432",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "",
|
|
6
6
|
"keywords": [
|
|
@@ -152,5 +152,5 @@
|
|
|
152
152
|
"access": "public",
|
|
153
153
|
"registry": "https://registry.npmjs.org/"
|
|
154
154
|
},
|
|
155
|
-
"gitHead": "
|
|
155
|
+
"gitHead": "01df977a7eb5166425c0078c2369ea240549f386"
|
|
156
156
|
}
|
package/scss/upload.scss
CHANGED
|
@@ -1,2 +1 @@
|
|
|
1
|
-
|
|
2
|
-
@import '~@uppy/dashboard/dist/style';
|
|
1
|
+
|
package/scss/vendor.scss
CHANGED
|
@@ -3,7 +3,9 @@
|
|
|
3
3
|
@import './variables';
|
|
4
4
|
@import './placeholders';
|
|
5
5
|
@import './mixins';
|
|
6
|
-
@import 'bootstrap/scss/bootstrap';
|
|
6
|
+
@import '~bootstrap/scss/bootstrap';
|
|
7
|
+
@import '~@uppy/core/dist/style';
|
|
8
|
+
@import '~@uppy/dashboard/dist/style';
|
|
7
9
|
|
|
8
10
|
.container-small {
|
|
9
11
|
@include make-container();
|