Index: LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html |
diff --git a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html |
index b7d9c4d015a5e1ea11728188d070d54879001702..8e6f89f4525d0c5ab2dc5c7de6ee2f85757dbcc2 100755 |
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html |
+++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html |
@@ -3,6 +3,10 @@ |
<head> |
<link href="resources/grid.css" rel="stylesheet"> |
<style> |
+div { |
+ width: 800; |
+ height: 600; |
+} |
.gridWithNone { |
grid-definition-columns: none; |
grid-definition-rows: none; |
@@ -52,6 +56,22 @@ |
grid-definition-columns: 1fr; |
grid-definition-rows: 2fr; |
} |
+.gridWithCalc { |
+ grid-definition-columns: calc(150px); |
+ grid-definition-rows: calc(75px); |
+} |
+.gridWithCalcComplex { |
+ grid-definition-columns: calc(50% + 150px); |
+ grid-definition-rows: calc(65% + 75px); |
+} |
+.gridWithCalcInsideMinMax { |
+ grid-definition-columns: minmax(10%, calc(15px)); |
+ grid-definition-rows: minmax(calc(20px), 50%); |
+} |
+.gridWithCalcComplexInsideMinMax { |
+ grid-definition-columns: minmax(10%, calc(50% + 15px)); |
+ grid-definition-rows: minmax(calc(20px + 10%), 50%); |
+} |
</style> |
<script src="../js/resources/js-test-pre.js"></script> |
</head> |
@@ -68,6 +88,10 @@ |
<div class="grid gridWithMinContent" id="gridWithMinContent"></div> |
<div class="grid gridWithMaxContent" id="gridWithMaxContent"></div> |
<div class="grid gridWithFraction" id="gridWithFraction"></div> |
+<div class="grid gridWithCalc" id="gridWithCalcElement"></div> |
+<div class="grid gridWithCalcComplex" id="gridWithCalcComplexElement"></div> |
+<div class="grid gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMaxElement"></div> |
+<div class="grid gridWithCalcComplexInsideMinMax" id="gridWithCalcComplexInsideMinMaxElement"></div> |
alancutter (OOO until 2018)
2013/09/30 00:24:59
Ditto.
|
<script src="resources/grid-definitions-parsing-utils.js"></script> |
<script src="resources/grid-columns-rows-get-set.js"></script> |
<script src="../js/resources/js-test-post.js"></script> |