Skip to content

Commit 4bedef4

Browse files
committed
Fix issue with css guards not hiding inner classes
1 parent 41f53f2 commit 4bedef4

File tree

4 files changed

+45
-1
lines changed

4 files changed

+45
-1
lines changed

lib/less/join-selector-visitor.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
this.contexts.push(paths);
2222

2323
if (! rulesetNode.root) {
24+
rulesetNode.selectors = rulesetNode.selectors.filter(function(selector) { return selector.getIsOutput(); });
25+
if (rulesetNode.selectors.length === 0) {
26+
rulesetNode.rules.length = 0;
27+
}
2428
rulesetNode.joinSelectors(paths, context, rulesetNode.selectors);
2529
rulesetNode.paths = paths;
2630
}

lib/less/tree/directive.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ tree.Directive = function (name, value, index, currentFileInfo) {
1010
this.value = value;
1111
}
1212
this.currentFileInfo = currentFileInfo;
13+
1314
};
1415
tree.Directive.prototype = {
1516
type: "Directive",

test/css/css-guards.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@
1010
.multiple-conditions-1 {
1111
color: red;
1212
}
13+
.inheritance .test {
14+
color: black;
15+
}
16+
.inheritance:hover {
17+
color: pink;
18+
}

test/less/css-guards.less

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,37 @@
2828

2929
@b: 2;
3030
@c: 3;
31-
@d: 3;
31+
@d: 3;
32+
33+
.inheritance when (@b = 2) {
34+
.test {
35+
color: black;
36+
}
37+
&:hover {
38+
color: pink;
39+
}
40+
.hideme when (@b = 1) {
41+
color: green;
42+
}
43+
& when (@b = 1) {
44+
hideme: green;
45+
}
46+
}
47+
48+
.hideme when (@b = 1) {
49+
.test {
50+
color: black;
51+
}
52+
&:hover {
53+
color: pink;
54+
}
55+
.hideme when (@b = 1) {
56+
color: green;
57+
}
58+
}
59+
60+
& when (@b = 1) {
61+
.hideme {
62+
color: red;
63+
}
64+
}

0 commit comments

Comments
 (0)