Index: LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html |
diff --git a/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html b/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html |
index 49ca2888f1e9c07cd4d2bdb1a3524aceb89defae..b163ce77aca409362c5b80d336e096c20e6092bc 100644 |
--- a/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html |
+++ b/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html |
@@ -15,56 +15,56 @@ |
width: 77px; |
} |
.gridWithFixed { |
- grid-definition-columns: (first) 10px; |
- grid-definition-rows: (first) 15px; |
+ grid-template-columns: (first) 10px; |
+ grid-template-rows: (first) 15px; |
} |
.gridWithPercent { |
- grid-definition-columns: 53% (last); |
- grid-definition-rows: 27% (last); |
+ grid-template-columns: 53% (last); |
+ grid-template-rows: 27% (last); |
} |
.gridWithAuto { |
- grid-definition-columns: (first) auto; |
- grid-definition-rows: auto (last); |
+ grid-template-columns: (first) auto; |
+ grid-template-rows: auto (last); |
} |
.gridWithMinMax { |
- grid-definition-columns: (first) minmax(10%, 15px); |
- grid-definition-rows: minmax(20px, 50%) (last); |
+ grid-template-columns: (first) minmax(10%, 15px); |
+ grid-template-rows: minmax(20px, 50%) (last); |
} |
.gridWithFixedMultiple { |
- grid-definition-columns: (first nav) 10px (last); |
- grid-definition-rows: (first nav) 15px (last); |
+ grid-template-columns: (first nav) 10px (last); |
+ grid-template-rows: (first nav) 15px (last); |
} |
.gridWithPercentageSameStringMultipleTimes { |
- grid-definition-columns: (first nav) 10% (nav) 15% (last); |
- grid-definition-rows: (first nav2) 25% (nav2) 75% (last); |
+ grid-template-columns: (first nav) 10% (nav) 15% (last); |
+ grid-template-rows: (first nav2) 25% (nav2) 75% (last); |
} |
.gridWithRepeat { |
- grid-definition-columns: (first) 10px repeat(2, (nav nav2) 50%); |
- grid-definition-rows: 100px repeat(2, (nav nav2) 25%) (last); |
+ grid-template-columns: (first) 10px repeat(2, (nav nav2) 50%); |
+ grid-template-rows: 100px repeat(2, (nav nav2) 25%) (last); |
} |
.gridWithEmptyParentheses { |
- grid-definition-columns: () 10px; |
- grid-definition-rows: 20px ( ) 50px (); |
+ grid-template-columns: () 10px; |
+ grid-template-rows: 20px ( ) 50px (); |
} |
.gridWithoutParentheses { |
- grid-definition-columns: first nav 10px; |
- grid-definition-rows: first 50% last; |
+ grid-template-columns: first nav 10px; |
+ grid-template-rows: first 50% last; |
} |
.gridWithInvalidNestedParentheses { |
- grid-definition-columns: (first (nav)) 10px (last); |
- grid-definition-rows: (first) 50% (last (nav) nav2); |
+ grid-template-columns: (first (nav)) 10px (last); |
+ grid-template-rows: (first) 50% (last (nav) nav2); |
} |
.gridWithUnbalancedParentheses { |
- grid-definition-columns: (first nav 10px; |
- grid-definition-rows: (first) 50% last); |
+ grid-template-columns: (first nav 10px; |
+ grid-template-rows: (first) 50% last); |
} |
.gridWithMisplacedParentheses { |
- grid-definition-columns: (first 10px) 50%; |
- grid-definition-rows: (first) (nav 50%); |
+ grid-template-columns: (first 10px) 50%; |
+ grid-template-rows: (first) (nav 50%); |
} |
.gridWithContiguousParentheses { |
- grid-definition-columns: (first) (nav) 10px; |
- grid-definition-rows: 50px (nav nav2) (middle) 10px; |
+ grid-template-columns: (first) (nav) 10px; |
+ grid-template-rows: 50px (nav nav2) (middle) 10px; |
} |
</style> |
<script src="../../resources/js-test.js"></script> |
@@ -93,9 +93,9 @@ |
<script src="resources/grid-definitions-parsing-utils.js"></script> |
<script> |
- description('Test that setting and getting grid-definition-columns and grid-definition-rows works as expected'); |
+ description('Test that setting and getting grid-template-columns and grid-template-rows works as expected'); |
- debug("Test getting grid-definition-columns and grid-definition-rows set through CSS"); |
+ debug("Test getting grid-template-columns and grid-template-rows set through CSS"); |
testGridDefinitionsValues(document.getElementById("gridWithFixedElement"), "(first) 10px", "(first) 15px"); |
testGridDefinitionsValues(document.getElementById("gridWithPercentElement"), "424px (last)", "162px (last)"); |
testGridDefinitionsValues(document.getElementById("gridWithPercentWithoutSize"), "0px (last)", "0px (last)"); |
@@ -109,7 +109,7 @@ |
testGridDefinitionsValues(document.getElementById("gridWithEmptyParentheses"), "10px", "20px 50px"); |
debug(""); |
- debug("Test getting and setting grid-definition-columns and grid-definition-rows through JS"); |
+ debug("Test getting and setting grid-template-columns and grid-template-rows through JS"); |
testGridDefinitionsSetJSValues("(first) 18px", "66px (last)", "(first) 18px", "66px (last)", "(first) 18px", "66px (last)"); |
testGridDefinitionsSetJSValues("(first) 55%", "40% (last)", "(first) 440px", "240px (last)", "(first) 55%", "40% (last)"); |
testGridDefinitionsSetJSValues("(first) auto", "auto (last)", "(first) 0px", "0px (last)", "(first) auto", "auto (last)"); |
@@ -125,7 +125,7 @@ |
testGridDefinitionsSetJSValues("(first) auto repeat(2, (foo bar) 20px)", "220px (foo) repeat(1, 50% (baz)", "(first) 0px (foo bar) 20px (foo bar) 20px", "220px (foo) 300px (baz)", "(first) auto (foo bar) 20px (foo bar) 20px", "220px (foo) 50% (baz)"); |
debug(""); |
- debug("Test getting invalid grid-definition-columns and grid-definition-rows set through CSS"); |
+ debug("Test getting invalid grid-template-columns and grid-template-rows set through CSS"); |
testGridDefinitionsValues(document.getElementById("gridWithoutParentheses"), "none", "none"); |
testGridDefinitionsValues(document.getElementById("gridWithInvalidNestedParentheses"), "none", "none"); |
testGridDefinitionsValues(document.getElementById("gridWithUnbalancedParentheses"), "none", "none"); |
@@ -133,7 +133,7 @@ |
testGridDefinitionsValues(document.getElementById("gridWithContiguousParentheses"), "none", "none"); |
debug(""); |
- debug("Test getting and setting invalid grid-definition-columns and grid-definition-rows through JS"); |
+ debug("Test getting and setting invalid grid-template-columns and grid-template-rows through JS"); |
testGridDefinitionsSetBadJSValues("(foo)", "(bar"); |
testGridDefinitionsSetBadJSValues("(foo bar)", "(bar foo)"); |
testGridDefinitionsSetBadJSValues("foo bar 10px", "50% baz bar foo 2em"); |