Skip to content

Commit 2b8459d

Browse files
authored
Merge branch 'master' into throw_syntax_error_if_function_expr_is_empty
2 parents f2d7c7d + c954c72 commit 2b8459d

File tree

3 files changed

+42
-8
lines changed

3 files changed

+42
-8
lines changed

Diff for: src/css/Colors.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ var Colors = module.exports = {
9494
mediumaquamarine : "#66cdaa",
9595
mediumblue : "#0000cd",
9696
mediumorchid : "#ba55d3",
97-
mediumpurple : "#9370d8",
97+
mediumpurple : "#9370db",
9898
mediumseagreen : "#3cb371",
9999
mediumslateblue : "#7b68ee",
100100
mediumspringgreen : "#00fa9a",
@@ -115,7 +115,7 @@ var Colors = module.exports = {
115115
palegoldenrod : "#eee8aa",
116116
palegreen : "#98fb98",
117117
paleturquoise : "#afeeee",
118-
palevioletred : "#d87093",
118+
palevioletred : "#db7093",
119119
papayawhip : "#ffefd5",
120120
peachpuff : "#ffdab9",
121121
peru : "#cd853f",
@@ -153,8 +153,8 @@ var Colors = module.exports = {
153153
yellowgreen : "#9acd32",
154154
// 'currentColor' color keyword https: //www.w3.org/TR/css3-color/#currentcolor
155155
currentColor : "The value of the 'color' property.",
156-
// CSS2 system colors https: //www.w3.org/TR/css3-color/#css2-system
157-
activeBorder : "Active window border.",
156+
// CSS2 system colors https://www.w3.org/TR/css3-color/#css2-system
157+
activeborder : "Active window border.",
158158
activecaption : "Active window caption.",
159159
appworkspace : "Background color of multiple document interface.",
160160
background : "Desktop background.",

Diff for: src/css/Properties.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ var Properties = module.exports = {
9393
"border-color" : "<color>{1,4}",
9494
"border-image" : 1,
9595
"border-image-outset" : "[ <length> | <number> ]{1,4}",
96-
"border-image-repeat" : "[ stretch | repeat | round ]{1,2}",
96+
"border-image-repeat" : "[ stretch | repeat | round | space ]{1,2}",
9797
"border-image-slice" : "<border-image-slice>",
9898
"border-image-source" : "<image> | none",
9999
"border-image-width" : "[ <length> | <percentage> | <number> | auto ]{1,4}",
@@ -214,7 +214,7 @@ var Properties = module.exports = {
214214
"-ms-flex-align" : "start | end | center | stretch | baseline",
215215
"-ms-flex-direction" : "row | row-reverse | column | column-reverse",
216216
"-ms-flex-order" : "<number>",
217-
"-ms-flex-pack" : "start | end | center | justify",
217+
"-ms-flex-pack" : "start | end | center | justify | distribute",
218218
"-ms-flex-wrap" : "nowrap | wrap | wrap-reverse",
219219
"float" : "left | right | none",
220220
"float-offset" : 1,
@@ -378,7 +378,7 @@ var Properties = module.exports = {
378378
"pitch-range" : 1,
379379
"play-during" : 1,
380380
"pointer-events" : "auto | none | visiblePainted | visibleFill | visibleStroke | visible | painted | fill | stroke | all",
381-
"position" : "static | relative | absolute | fixed | sticky",
381+
"position" : "static | relative | absolute | fixed | sticky | -webkit-sticky",
382382
"presentation-level" : 1,
383383
"punctuation-trim" : 1,
384384

@@ -460,7 +460,7 @@ var Properties = module.exports = {
460460
// U
461461
"unicode-bidi" : "normal | embed | isolate | bidi-override | isolate-override | plaintext",
462462
"user-modify" : "read-only | read-write | write-only",
463-
"user-select" : "none | text | toggle | element | elements | all",
463+
"user-select" : "auto | text | none | contain | all",
464464

465465
// V
466466
"vertical-align" : "auto | use-script | baseline | sub | super | top | text-top | central | middle | bottom | text-bottom | <percentage> | <length>",

Diff for: tests/css/Validation.js

+34
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,23 @@ var YUITest = require("yuitest"),
502502
}
503503
}));
504504

505+
suite.add(new ValidationTestCase({
506+
property: "border-image-repeat",
507+
508+
valid: [
509+
"stretch",
510+
"repeat",
511+
"round",
512+
"space",
513+
"round stretch"
514+
],
515+
516+
invalid: {
517+
"foo": "Expected ([ stretch | repeat | round | space ]{1,2}) but found 'foo'.",
518+
"round stretch foo": "Expected end of value but found 'foo'."
519+
}
520+
}));
521+
505522
suite.add(new ValidationTestCase({
506523
property: "border-image-slice",
507524

@@ -1569,6 +1586,23 @@ var YUITest = require("yuitest"),
15691586
}
15701587
}));
15711588

1589+
suite.add(new ValidationTestCase({
1590+
property: "position",
1591+
1592+
valid: [
1593+
"static",
1594+
"relative",
1595+
"absolute",
1596+
"fixed",
1597+
"sticky",
1598+
"-webkit-sticky"
1599+
],
1600+
1601+
invalid: {
1602+
"foo" : "Expected (static | relative | absolute | fixed | sticky | -webkit-sticky) but found 'foo'."
1603+
}
1604+
}));
1605+
15721606
suite.add(new ValidationTestCase({
15731607
property: "stroke-dasharray",
15741608

0 commit comments

Comments
 (0)