efront 4.2.7 → 4.2.8
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.
|
@@ -583,10 +583,11 @@ function 素馨(text, scopeName, compress) {
|
|
|
583
583
|
}
|
|
584
584
|
return result.rest.map(a => a.join("")).concat(result).map(a => {
|
|
585
585
|
var ats = [];
|
|
586
|
-
a = a.replace(
|
|
586
|
+
a = a.replace(/\s*@\{(@[^\}]*)\}/g, function (_, q) {
|
|
587
|
+
q = q.replace(/((?:\s|\))(?:and|or))\(/g, '$1 (');
|
|
587
588
|
ats.push(q);
|
|
588
589
|
return ''
|
|
589
|
-
});
|
|
590
|
+
}).trim();
|
|
590
591
|
if (!a) return '';
|
|
591
592
|
var atk = ats.join(';');
|
|
592
593
|
if (queried.key !== atk) {
|
|
@@ -69,4 +69,6 @@ assert(素馨(`a>:root{&:not(a):not(b){c:d}}`, '.abc-'), `a>.abc-:not(a):not(b){
|
|
|
69
69
|
|
|
70
70
|
assert(素馨(`.a (){ &:after{abc:1}} .b{.a();}`, '.abc-'), `.abc- .b:after{abc:1;}`);
|
|
71
71
|
assert(素馨(`@a:1px;@margin-x:@a+10px; a{m:-@margin-x}`), `a{m:-11px;}`);
|
|
72
|
-
assert(素馨(`a{@a:1px;@margin-x:@a+10px;m:-@margin-x}`), `a{m:-11px;}`);
|
|
72
|
+
assert(素馨(`a{@a:1px;@margin-x:@a+10px;m:-@margin-x}`), `a{m:-11px;}`);
|
|
73
|
+
assert(素馨(`@media screen{&.a{b:1}}`,'a'), `@media screen{a.a{b:1;}}`);
|
|
74
|
+
assert(素馨(`@media screen and(max-width:100px){&.a{b:1}}`,'a'), `@media screen and (max-width:100px){a.a{b:1;}}`);
|
package/coms/layer/glance.js
CHANGED
|
@@ -99,23 +99,20 @@ function main(mainPath, historyName = "") {
|
|
|
99
99
|
};
|
|
100
100
|
var bindClass = function () {
|
|
101
101
|
if (closed) {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
102
|
+
if (hasClass(layer, "open")) {
|
|
103
|
+
removeClass(layer, 'open');
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
addClass(layer, 'close');
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
if (hasClass(layer, 'close')) {
|
|
111
|
+
removeClass(layer, 'close');
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
addClass(layer, 'open');
|
|
108
115
|
}
|
|
109
|
-
} else {
|
|
110
|
-
addClass(layer, 'open');
|
|
111
|
-
removeClass(layer, 'close');
|
|
112
|
-
css(layer, `margin-left:${fromOffset(leftLayer.offsetWidth)}`);
|
|
113
|
-
setTimeout(function () {
|
|
114
|
-
var collapse = layer.clientLeft === 0;
|
|
115
|
-
if (!collapse) {
|
|
116
|
-
css(layer, 'margin-left:0');
|
|
117
|
-
}
|
|
118
|
-
}, 20);
|
|
119
116
|
}
|
|
120
117
|
};
|
|
121
118
|
var update = function (event) {
|
package/coms/layer/glance.less
CHANGED
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
position: relative;
|
|
7
7
|
border-radius: 3px;
|
|
8
8
|
overflow: hidden;
|
|
9
|
-
border-left: @left-width solid transparent;
|
|
10
9
|
box-sizing: border-box;
|
|
11
10
|
overflow: visible;
|
|
12
11
|
transition: border-left-width 0.2s ease-out, margin-left .2s ease-out, left .2s ease-out;
|
|
@@ -40,20 +39,24 @@
|
|
|
40
39
|
padding: 50px 10px 20px 10px;
|
|
41
40
|
}
|
|
42
41
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
// 宽屏: 用border-left
|
|
43
|
+
@media all and (min-width:961px) {
|
|
44
|
+
& {
|
|
45
|
+
border-left: @left-width solid transparent;
|
|
46
|
+
}
|
|
46
47
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
margin-left: 0 !important;
|
|
48
|
+
&.close {
|
|
49
|
+
border-left-width: 0;
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
-
|
|
53
|
+
// 窄屏: 用margin-left
|
|
54
|
+
@media(max-width:960px) {
|
|
55
|
+
|
|
54
56
|
& {
|
|
55
|
-
border-radius: 0;
|
|
56
|
-
border-left-width: 0 !important;
|
|
57
57
|
margin-left: 0;
|
|
58
58
|
}
|
|
59
|
+
&.open {
|
|
60
|
+
margin-left: @left-width;
|
|
61
|
+
}
|
|
59
62
|
}
|
package/data/packexe-setup.sfx
CHANGED
|
Binary file
|