Skip to content

Commit f4e7529

Browse files
committed
Merge branch 'master' of https://github.com/less/less.js
2 parents 4cc9b83 + 9538aba commit f4e7529

File tree

6 files changed

+20
-16
lines changed

6 files changed

+20
-16
lines changed

dist/less.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Less - Leaner CSS v4.1.0
2+
* Less - Leaner CSS v4.1.1
33
* http://lesscss.org
44
*
55
* Copyright (c) 2009-2021, Alexis Sellier <[email protected]>
@@ -2890,7 +2890,8 @@
28902890
// so `1px + 2` will yield `3px`.
28912891
operate: function (context, op, other) {
28922892
/* jshint noempty:false */
2893-
var value = this._operate(context, op, this.value, other.value), unit = this.unit.clone();
2893+
var value = this._operate(context, op, this.value, other.value);
2894+
var unit = this.unit.clone();
28942895
if (op === '+' || op === '-') {
28952896
if (unit.numerator.length === 0 && unit.denominator.length === 0) {
28962897
unit = other.unit.clone();
@@ -3005,8 +3006,9 @@
30053006
if (b instanceof Dimension && a instanceof Color) {
30063007
b = b.toColor();
30073008
}
3008-
if (!a.operate) {
3009-
if (a instanceof Operation && a.op === '/' && context.math === MATH$1.PARENS_DIVISION) {
3009+
if (!a.operate || !b.operate) {
3010+
if ((a instanceof Operation || b instanceof Operation)
3011+
&& a.op === '/' && context.math === MATH$1.PARENS_DIVISION) {
30103012
return new Operation(this.op, [a, b], this.isSpaced);
30113013
}
30123014
throw { type: 'Operation',
@@ -10510,7 +10512,7 @@
1051010512
return render;
1051110513
}
1051210514

10513-
var version = "4.1.0";
10515+
var version = "4.1.1";
1051410516

1051510517
function parseNodeVersion(version) {
1051610518
var match = version.match(/^v(\d{1,2})\.(\d{1,2})\.(\d{1,2})(?:-([0-9A-Za-z-.]+))?(?:\+([0-9A-Za-z-.]+))?$/); // eslint-disable-line max-len

dist/less.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/less.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/less/dist/less.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Less - Leaner CSS v4.1.0
2+
* Less - Leaner CSS v4.1.1
33
* http://lesscss.org
44
*
55
* Copyright (c) 2009-2021, Alexis Sellier <[email protected]>
@@ -2890,7 +2890,8 @@
28902890
// so `1px + 2` will yield `3px`.
28912891
operate: function (context, op, other) {
28922892
/* jshint noempty:false */
2893-
var value = this._operate(context, op, this.value, other.value), unit = this.unit.clone();
2893+
var value = this._operate(context, op, this.value, other.value);
2894+
var unit = this.unit.clone();
28942895
if (op === '+' || op === '-') {
28952896
if (unit.numerator.length === 0 && unit.denominator.length === 0) {
28962897
unit = other.unit.clone();
@@ -3005,8 +3006,9 @@
30053006
if (b instanceof Dimension && a instanceof Color) {
30063007
b = b.toColor();
30073008
}
3008-
if (!a.operate) {
3009-
if (a instanceof Operation && a.op === '/' && context.math === MATH$1.PARENS_DIVISION) {
3009+
if (!a.operate || !b.operate) {
3010+
if ((a instanceof Operation || b instanceof Operation)
3011+
&& a.op === '/' && context.math === MATH$1.PARENS_DIVISION) {
30103012
return new Operation(this.op, [a, b], this.isSpaced);
30113013
}
30123014
throw { type: 'Operation',
@@ -10510,7 +10512,7 @@
1051010512
return render;
1051110513
}
1051210514

10513-
var version = "4.1.0";
10515+
var version = "4.1.1";
1051410516

1051510517
function parseNodeVersion(version) {
1051610518
var match = version.match(/^v(\d{1,2})\.(\d{1,2})\.(\d{1,2})(?:-([0-9A-Za-z-.]+))?(?:\+([0-9A-Za-z-.]+))?$/); // eslint-disable-line max-len

packages/less/dist/less.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/less/dist/less.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)