Skip to content

Commit a18a60d

Browse files
committed
Update properties for Flexbox 2009
Removed unprefixed box and inline-box from display Replaced unprefixed box-* properties with moz and webkit prefixes.
1 parent 8ac64fa commit a18a60d

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

src/css/Properties.js

+19-10
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,24 @@ var Properties = {
200200
"border-top-width" : "<border-width>",
201201
"border-width" : { multi: "<border-width>", max: 4 },
202202
"bottom" : "<margin-width> | inherit",
203-
"box-align" : "start | end | center | baseline | stretch", //http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/
204-
"box-decoration-break" : "slice |clone",
205-
"box-direction" : "normal | reverse | inherit",
206-
"box-flex" : "<number>",
207-
"box-flex-group" : "<integer>",
208-
"box-lines" : "single | multiple",
209-
"box-ordinal-group" : "<integer>",
210-
"box-orient" : "horizontal | vertical | inline-axis | block-axis | inherit",
211-
"box-pack" : "start | end | center | justify",
203+
"-moz-box-align" : "start | end | center | baseline | stretch",
204+
"-moz-box-decoration-break" : "slice |clone",
205+
"-moz-box-direction" : "normal | reverse | inherit",
206+
"-moz-box-flex" : "<number>",
207+
"-moz-box-flex-group" : "<integer>",
208+
"-moz-box-lines" : "single | multiple",
209+
"-moz-box-ordinal-group" : "<integer>",
210+
"-moz-box-orient" : "horizontal | vertical | inline-axis | block-axis | inherit",
211+
"-moz-box-pack" : "start | end | center | justify",
212+
"-webkit-box-align" : "start | end | center | baseline | stretch",
213+
"-webkit-box-decoration-break" : "slice |clone",
214+
"-webkit-box-direction" : "normal | reverse | inherit",
215+
"-webkit-box-flex" : "<number>",
216+
"-webkit-box-flex-group" : "<integer>",
217+
"-webkit-box-lines" : "single | multiple",
218+
"-webkit-box-ordinal-group" : "<integer>",
219+
"-webkit-box-orient" : "horizontal | vertical | inline-axis | block-axis | inherit",
220+
"-webkit-box-pack" : "start | end | center | justify",
212221
"box-shadow" : function (expression) {
213222
var result = false,
214223
part;
@@ -254,7 +263,7 @@ var Properties = {
254263

255264
//D
256265
"direction" : "ltr | rtl | inherit",
257-
"display" : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker | -webkit-box | -webkit-inline-box | flex | -webkit-flex | inline-flex | -webkit-inline-flex",
266+
"display" : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | grid | inline-grid | none | inherit | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker | -webkit-box | -webkit-inline-box | flex | -webkit-flex | inline-flex | -webkit-inline-flex",
258267
"dominant-baseline" : 1,
259268
"drop-initial-after-adjust" : "central | middle | after-edge | text-after-edge | ideographic | alphabetic | mathematical | <percentage> | <length>",
260269
"drop-initial-after-align" : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",

tests/css/Validation.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -570,8 +570,6 @@
570570
"table-column",
571571
"table-cell",
572572
"table-caption",
573-
"box",
574-
"inline-box",
575573
"grid",
576574
"inline-grid",
577575
"none",
@@ -600,7 +598,7 @@
600598
],
601599

602600
invalid: {
603-
"foo" : "Expected (inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker | -webkit-box | -webkit-inline-box | flex | -webkit-flex | inline-flex | -webkit-inline-flex) but found 'foo'."
601+
"foo" : "Expected (inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | grid | inline-grid | none | inherit | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker | -webkit-box | -webkit-inline-box | flex | -webkit-flex | inline-flex | -webkit-inline-flex) but found 'foo'."
604602
}
605603
}));
606604

0 commit comments

Comments
 (0)