| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <head> | 2 <head> |
| 3 <link href="resources/grid.css" rel="stylesheet"/> | 3 <link href="resources/grid.css" rel="stylesheet"/> |
| 4 <link href="resources/grid-alignment.css" rel="stylesheet"/> |
| 4 <style> | 5 <style> |
| 5 .grid { | 6 .grid { |
| 6 font: 10px/1 Ahem; | 7 font: 10px/1 Ahem; |
| 7 } | 8 } |
| 8 .gridAutoAndAuto { | 9 .gridAutoAndAuto { |
| 9 grid-template-columns: auto auto; | 10 grid-template-columns: auto auto; |
| 10 } | 11 } |
| 11 .gridFixedMinContentFixedMaxContent { | 12 .gridFixedMinContentFixedMaxContent { |
| 12 grid-template-columns: minmax(50px, min-content) minmax(40px, max-content); | 13 grid-template-columns: minmax(50px, min-content) minmax(40px, max-content); |
| 13 } | 14 } |
| 14 .gridMaxContentAndAuto { | 15 .gridMaxContentAndAuto { |
| 15 grid-template-columns: max-content auto; | 16 grid-template-columns: max-content auto; |
| 16 } | 17 } |
| 17 .gridMinContentAndAuto { | 18 .gridMinContentAndAuto { |
| 18 grid-template-columns: min-content auto; | 19 grid-template-columns: min-content auto; |
| 19 } | 20 } |
| 20 </style> | 21 </style> |
| 21 <script src="../../resources/js-test.js"></script> | 22 <script src="../../resources/js-test.js"></script> |
| 22 </head> | 23 </head> |
| 23 <body> | 24 <body> |
| 24 <div class="grid gridAutoAndAuto" id="gridAutoAndAuto"> | 25 <div class="grid gridAutoAndAuto justifyContentStart" id="gridAutoAndAuto"> |
| 25 <div class="firstRowFirstColumn">X</div> | 26 <div class="firstRowFirstColumn">X</div> |
| 26 <div class="firstRowBothColumn">XXX XX XXX</div> | 27 <div class="firstRowBothColumn">XXX XX XXX</div> |
| 27 </div> | 28 </div> |
| 28 | 29 |
| 29 <div class="grid gridAutoAndAuto" id="gridAutoAndAutoReversed"> | 30 <div class="grid gridAutoAndAuto justifyContentStart" id="gridAutoAndAutoReverse
d"> |
| 30 <div class="firstRowSecondColumn">X</div> | 31 <div class="firstRowSecondColumn">X</div> |
| 31 <div class="firstRowBothColumn">XXX XX XXX</div> | 32 <div class="firstRowBothColumn">XXX XX XXX</div> |
| 32 </div> | 33 </div> |
| 33 | 34 |
| 34 <div class="grid gridFixedMinContentFixedMaxContent" id="gridFixedMinContentFixe
dMaxContent"> | 35 <div class="grid gridFixedMinContentFixedMaxContent" id="gridFixedMinContentFixe
dMaxContent"> |
| 35 <div class="sizedToGridArea firstRowFirstColumn"></div> | 36 <div class="sizedToGridArea firstRowFirstColumn"></div> |
| 36 <div class="firstRowBothColumn">XXX XX XXX</div> | 37 <div class="firstRowBothColumn">XXX XX XXX</div> |
| 37 </div> | 38 </div> |
| 38 | 39 |
| 39 <div class="grid gridFixedMinContentFixedMaxContent" id="gridFixedMinContentFixe
dMaxContentTwoEmptyChildren"> | 40 <div class="grid gridFixedMinContentFixedMaxContent" id="gridFixedMinContentFixe
dMaxContentTwoEmptyChildren"> |
| 40 <div class="sizedToGridArea firstRowFirstColumn"></div> | 41 <div class="sizedToGridArea firstRowFirstColumn"></div> |
| 41 <div class="sizedToGridArea firstRowSecondColumn"></div> | 42 <div class="sizedToGridArea firstRowSecondColumn"></div> |
| 42 <div class="firstRowBothColumn">XXX XX XXX</div> | 43 <div class="firstRowBothColumn">XXX XX XXX</div> |
| 43 </div> | 44 </div> |
| 44 | 45 |
| 45 <div class="grid gridFixedMinContentFixedMaxContent" id="gridFixedMinContentFixe
dMaxContentFixedSizeChild"> | 46 <div class="grid gridFixedMinContentFixedMaxContent" id="gridFixedMinContentFixe
dMaxContentFixedSizeChild"> |
| 46 <div class="firstRowFirstColumn">XXXXXX</div> | 47 <div class="firstRowFirstColumn">XXXXXX</div> |
| 47 <div class="firstRowBothColumn">XXX XX XXX</div> | 48 <div class="firstRowBothColumn">XXX XX XXX</div> |
| 48 </div> | 49 </div> |
| 49 | 50 |
| 50 <div class="grid gridMaxContentAndAuto" id="gridMaxContentAndAuto"> | 51 <div class="grid gridMaxContentAndAuto justifyContentStart" id="gridMaxContentAn
dAuto"> |
| 51 <div class="firstRowFirstColumn">X</div> | 52 <div class="firstRowFirstColumn">X</div> |
| 52 <div class="firstRowBothColumn">XXX XX XXX</div> | 53 <div class="firstRowBothColumn">XXX XX XXX</div> |
| 53 </div> | 54 </div> |
| 54 | 55 |
| 55 <div class="grid gridMaxContentAndAuto" id="gridMaxContentAndAutoReversed"> | 56 <div class="grid gridMaxContentAndAuto justifyContentStart" id="gridMaxContentAn
dAutoReversed"> |
| 56 <div class="firstRowSecondColumn">X</div> | 57 <div class="firstRowSecondColumn">X</div> |
| 57 <div class="firstRowBothColumn">XXX XX XXX</div> | 58 <div class="firstRowBothColumn">XXX XX XXX</div> |
| 58 </div> | 59 </div> |
| 59 | 60 |
| 60 <div class="grid gridMinContentAndAuto" id="gridMinContentAndAuto"> | 61 <div class="grid gridMinContentAndAuto justifyContentStart" id="gridMinContentAn
dAuto"> |
| 61 <div class="firstRowFirstColumn">X</div> | 62 <div class="firstRowFirstColumn">X</div> |
| 62 <div class="firstRowBothColumn">XXX XX XXX</div> | 63 <div class="firstRowBothColumn">XXX XX XXX</div> |
| 63 </div> | 64 </div> |
| 64 | 65 |
| 65 <div class="grid gridMinContentAndAuto" id="gridMinContentAndAutoReversed"> | 66 <div class="grid gridMinContentAndAuto justifyContentStart" id="gridMinContentAn
dAutoReversed"> |
| 66 <div class="firstRowSecondColumn">X</div> | 67 <div class="firstRowSecondColumn">X</div> |
| 67 <div class="firstRowBothColumn">XXX XX XXX</div> | 68 <div class="firstRowBothColumn">XXX XX XXX</div> |
| 68 </div> | 69 </div> |
| 69 | 70 |
| 70 <script> | 71 <script> |
| 71 function testGridColumnsValues(id, computedColumnValue) | 72 function testGridColumnsValues(id, computedColumnValue) |
| 72 { | 73 { |
| 73 shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyVa
lue('grid-template-columns')", computedColumnValue); | 74 shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyVa
lue('grid-template-columns')", computedColumnValue); |
| 74 } | 75 } |
| 75 | 76 |
| 76 description('This test checks that content sized tracks are initialized using no
n-spanning grid items.'); | 77 description('This test checks that content sized tracks are initialized using no
n-spanning grid items.'); |
| 77 | 78 |
| 78 testGridColumnsValues("gridAutoAndAuto", "10px 90px"); | 79 testGridColumnsValues("gridAutoAndAuto", "10px 90px"); |
| 79 testGridColumnsValues("gridAutoAndAutoReversed", "90px 10px"); | 80 testGridColumnsValues("gridAutoAndAutoReversed", "90px 10px"); |
| 80 testGridColumnsValues("gridFixedMinContentFixedMaxContent", "50px 50px"); | 81 testGridColumnsValues("gridFixedMinContentFixedMaxContent", "50px 50px"); |
| 81 testGridColumnsValues("gridFixedMinContentFixedMaxContentTwoEmptyChildren", "50p
x 50px"); | 82 testGridColumnsValues("gridFixedMinContentFixedMaxContentTwoEmptyChildren", "50p
x 50px"); |
| 82 testGridColumnsValues("gridFixedMinContentFixedMaxContentFixedSizeChild", "60px
40px"); | 83 testGridColumnsValues("gridFixedMinContentFixedMaxContentFixedSizeChild", "60px
40px"); |
| 83 testGridColumnsValues("gridMaxContentAndAuto", "80px 20px"); | 84 testGridColumnsValues("gridMaxContentAndAuto", "80px 20px"); |
| 84 testGridColumnsValues("gridMaxContentAndAutoReversed", "90px 10px"); | 85 testGridColumnsValues("gridMaxContentAndAutoReversed", "90px 10px"); |
| 85 testGridColumnsValues("gridMinContentAndAuto", "10px 90px"); | 86 testGridColumnsValues("gridMinContentAndAuto", "10px 90px"); |
| 86 testGridColumnsValues("gridMinContentAndAutoReversed", "20px 80px"); | 87 testGridColumnsValues("gridMinContentAndAutoReversed", "20px 80px"); |
| 87 </script> | 88 </script> |
| 88 </body> | 89 </body> |
| OLD | NEW |