Index: LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html |
diff --git a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html |
index 25707c24d0e5c0bcd42bd0a6415cc9c2c891392c..1887149e879c420fc82eae1fca6af60d3b9d70ba 100644 |
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html |
+++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html |
@@ -28,83 +28,83 @@ if (window.testRunner) |
} |
.gridWithFixed { |
- grid-definition-columns: 7px 11px; |
- grid-definition-rows: 17px 2px; |
+ grid-template-columns: 7px 11px; |
+ grid-template-rows: 17px 2px; |
} |
.gridWithPercent { |
- grid-definition-columns: 53% 99%; |
- grid-definition-rows: 27% 52%; |
+ grid-template-columns: 53% 99%; |
+ grid-template-rows: 27% 52%; |
} |
.gridWithAuto { |
- grid-definition-columns: auto auto; |
- grid-definition-rows: auto auto; |
+ grid-template-columns: auto auto; |
+ grid-template-rows: auto auto; |
} |
.gridWithEM { |
- grid-definition-columns: 10em 12em; |
- grid-definition-rows: 15em 17em; |
+ grid-template-columns: 10em 12em; |
+ grid-template-rows: 15em 17em; |
font: 10px Ahem; |
} |
.gridWithNoneAndAuto { |
- grid-definition-columns: none auto; |
- grid-definition-rows: none auto; |
+ grid-template-columns: none auto; |
+ grid-template-rows: none auto; |
} |
.gridNoneWithAndFixed { |
- grid-definition-columns: none 15px; |
- grid-definition-rows: none 22px; |
+ grid-template-columns: none 15px; |
+ grid-template-rows: none 22px; |
} |
.gridWithThreeItems { |
- grid-definition-columns: 15px auto 10em; |
- grid-definition-rows: 12em 18px auto; |
+ grid-template-columns: 15px auto 10em; |
+ grid-template-rows: 12em 18px auto; |
font: 10px Ahem; |
} |
.gridWithPercentAndViewportPercent { |
- grid-definition-columns: 50% 15vw; |
- grid-definition-rows: 35% 28vh; |
+ grid-template-columns: 50% 15vw; |
+ grid-template-rows: 35% 28vh; |
} |
.gridWithFitContentAndFitAvailable { |
- grid-definition-columns: -webkit-content-available; |
- grid-definition-rows: -webkit-fit-content -webkit-fit-available; |
+ grid-template-columns: -webkit-content-available; |
+ grid-template-rows: -webkit-fit-content -webkit-fit-available; |
} |
.gridWithMinMaxContent { |
- grid-definition-columns: min-content max-content; |
- grid-definition-rows: max-content min-content; |
+ grid-template-columns: min-content max-content; |
+ grid-template-rows: max-content min-content; |
} |
.gridWithMinMaxAndFixed { |
- grid-definition-columns: minmax(45px, 30%) 15px; |
- grid-definition-rows: 12em minmax(35%, 10px); |
+ grid-template-columns: minmax(45px, 30%) 15px; |
+ grid-template-rows: 12em minmax(35%, 10px); |
font: 10px Ahem; |
} |
.gridWithMinMaxAndMinMaxContent { |
- grid-definition-columns: minmax(min-content, 30%) 15px; |
- grid-definition-rows: 12em minmax(35%, max-content); |
+ grid-template-columns: minmax(min-content, 30%) 15px; |
+ grid-template-rows: 12em minmax(35%, max-content); |
font: 10px Ahem; |
} |
.gridWithFractionFraction { |
- grid-definition-columns: 2fr 3fr; |
- grid-definition-rows: 3fr 5fr; |
+ grid-template-columns: 2fr 3fr; |
+ grid-template-rows: 3fr 5fr; |
} |
.gridWithFractionMinMax { |
- grid-definition-columns: minmax(min-content, 45px) 2fr; |
- grid-definition-rows: 3fr minmax(14px, max-content); |
+ grid-template-columns: minmax(min-content, 45px) 2fr; |
+ grid-template-rows: 3fr minmax(14px, max-content); |
} |
.gridWithCalcCalc { |
- grid-definition-columns: calc(200px) calc(10em); |
- grid-definition-rows: calc(15em) calc(75px); |
+ grid-template-columns: calc(200px) calc(10em); |
+ grid-template-rows: calc(15em) calc(75px); |
font: 10px Ahem; |
} |
.gridWithCalcAndFixed { |
- grid-definition-columns: calc(50%) 8em; |
- grid-definition-rows: 88px calc(25%); |
+ grid-template-columns: calc(50%) 8em; |
+ grid-template-rows: 88px calc(25%); |
font: 10px Ahem; |
} |
.gridWithCalcAndMinMax { |
- grid-definition-columns: calc(30px + 20%) minmax(min-content, 80px); |
- grid-definition-rows: minmax(25%, max-content) calc(10% - 7px); |
+ grid-template-columns: calc(30px + 20%) minmax(min-content, 80px); |
+ grid-template-rows: minmax(25%, max-content) calc(10% - 7px); |
} |
.gridWithCalcInsideMinMax { |
- grid-definition-columns: minmax(calc(23px + 10%), 400px) 12em; |
- grid-definition-rows: calc(150px) minmax(5%, calc(50% - 125px)); |
+ grid-template-columns: minmax(calc(23px + 10%), 400px) 12em; |
+ grid-template-rows: calc(150px) minmax(5%, calc(50% - 125px)); |
font: 10px Ahem; |
} |
</style> |