Skip to content

Commit 4a29fd8

Browse files
committed
Merge pull request #4779 from mnordick/master
Support CSS3 Grid Layout Module for inline styles
2 parents 926f372 + 8da4efa commit 4a29fd8

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/renderers/dom/shared/CSSProperty.js

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ var isUnitlessNumber = {
2626
flexShrink: true,
2727
flexNegative: true,
2828
flexOrder: true,
29+
gridRow: true,
30+
gridColumn: true,
2931
fontWeight: true,
3032
lineClamp: true,
3133
lineHeight: true,

src/renderers/dom/shared/__tests__/CSSProperty-test.js

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ describe('CSSProperty', function() {
2424
expect(CSSProperty.isUnitlessNumber.WebkitLineClamp).toBeTruthy();
2525
expect(CSSProperty.isUnitlessNumber.msFlexGrow).toBeTruthy();
2626
expect(CSSProperty.isUnitlessNumber.MozFlexGrow).toBeTruthy();
27+
expect(CSSProperty.isUnitlessNumber.msGridRow).toBeTruthy();
28+
expect(CSSProperty.isUnitlessNumber.msGridColumn).toBeTruthy();
2729
});
2830

2931
});

0 commit comments

Comments
 (0)