| 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 { font: 10px/1 Ahem; } | 6 .grid { font: 10px/1 Ahem; } |
| 6 | 7 |
| 7 .gridAutoAndMaxContent { | 8 .gridAutoAndMaxContent { |
| 8 grid-template-columns: auto max-content; | 9 grid-template-columns: auto max-content; |
| 9 } | 10 } |
| 10 .gridFixedMinContentAndFixedMaxContent { | 11 .gridFixedMinContentAndFixedMaxContent { |
| 11 grid-template-columns: minmax(10px, min-content) minmax(10px, max-content); | 12 grid-template-columns: minmax(10px, min-content) minmax(10px, max-content); |
| 12 } | 13 } |
| 13 .gridMinContentAndMaxContent { | 14 .gridMinContentAndMaxContent { |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 <div class="grid gridMinContentAndMaxContent" id="gridMinContentAndMaxContent"> | 56 <div class="grid gridMinContentAndMaxContent" id="gridMinContentAndMaxContent"> |
| 56 <div class="columns1And2">XX XX</div> | 57 <div class="columns1And2">XX XX</div> |
| 57 <div class="columns1And2">XXX XX XXX</div> | 58 <div class="columns1And2">XXX XX XXX</div> |
| 58 </div> | 59 </div> |
| 59 | 60 |
| 60 <div class="grid gridMinContentAndFixedAndMaxContent" id="gridMinContentAndFixed
AndMaxContent"> | 61 <div class="grid gridMinContentAndFixedAndMaxContent" id="gridMinContentAndFixed
AndMaxContent"> |
| 61 <div class="columns1To3">XXXX XXXX</div> | 62 <div class="columns1To3">XXXX XXXX</div> |
| 62 <div class="columns1To3">XXXXX XXX XXXX</div> | 63 <div class="columns1To3">XXXXX XXX XXXX</div> |
| 63 </div> | 64 </div> |
| 64 | 65 |
| 65 <div class="grid gridMaxContentAndFixedAndAuto" id="gridMaxContentAndFixedAndAut
o"> | 66 <div class="grid gridMaxContentAndFixedAndAuto justifyContentStart" id="gridMaxC
ontentAndFixedAndAuto"> |
| 66 <div class="columns1To3">XXXX XXXX</div> | 67 <div class="columns1To3">XXXX XXXX</div> |
| 67 <div class="columns1To3">XXXXX XXX XXXX</div> | 68 <div class="columns1To3">XXXXX XXX XXXX</div> |
| 68 </div> | 69 </div> |
| 69 | 70 |
| 70 <div class="grid gridRepeatTwoMaxContentAndMinContent" id="gridRepeatTwoMaxConte
ntAndMinContentTwoOverlapping"> | 71 <div class="grid gridRepeatTwoMaxContentAndMinContent" id="gridRepeatTwoMaxConte
ntAndMinContentTwoOverlapping"> |
| 71 <div class="columns1And2">XXXX XXXX</div> | 72 <div class="columns1And2">XXXX XXXX</div> |
| 72 <div class="columns3And4">XX XX</div> | 73 <div class="columns3And4">XX XX</div> |
| 73 <div class="columns1And2">XXXXX XXX XXXX</div> | 74 <div class="columns1And2">XXXXX XXX XXXX</div> |
| 74 <div class="columns3And4">XXX XX XXX</div> | 75 <div class="columns3And4">XXX XX XXX</div> |
| 75 </div> | 76 </div> |
| 76 | 77 |
| 77 <div class="grid gridRepeatTwoMaxContentAndMinContent" id="gridRepeatTwoMaxConte
ntAndMinContentThreeOverlapping"> | 78 <div class="grid gridRepeatTwoMaxContentAndMinContent" id="gridRepeatTwoMaxConte
ntAndMinContentThreeOverlapping"> |
| 78 <div class="columns2And3">XXXXX XXX XXXX</div> | 79 <div class="columns2And3">XXXXX XXX XXXX</div> |
| 79 <div class="columns3And4">XXX XX XXX</div> | 80 <div class="columns3And4">XXX XX XXX</div> |
| 80 <div class="columns1And2">XXXX XXXX</div> | 81 <div class="columns1And2">XXXX XXXX</div> |
| 81 </div> | 82 </div> |
| 82 | 83 |
| 83 <div class="grid gridRepeatTwoMaxContentAndMinContent" id="gridRepeatTwoMaxConte
ntAndMinContentTwoAndFourOverlapping"> | 84 <div class="grid gridRepeatTwoMaxContentAndMinContent" id="gridRepeatTwoMaxConte
ntAndMinContentTwoAndFourOverlapping"> |
| 84 <div class="columns1To4">XXXX XXXX</div> | 85 <div class="columns1To4">XXXX XXXX</div> |
| 85 <div class="columns3And4">XX XX</div> | 86 <div class="columns3And4">XX XX</div> |
| 86 <div class="columns1To4">XXXXX XXX XXXX</div> | 87 <div class="columns1To4">XXXXX XXX XXXX</div> |
| 87 <div class="columns1And2">XXX XX XXX</div> | 88 <div class="columns1And2">XXX XX XXX</div> |
| 88 <div class="columns3And4">X X X X X</div> | 89 <div class="columns3And4">X X X X X</div> |
| 89 <div class="columns1And2">XXXXXX</div> | 90 <div class="columns1And2">XXXXXX</div> |
| 90 </div> | 91 </div> |
| 91 | 92 |
| 92 <div class="grid gridRepeatTwoAutoAndMaxContent" id="gridRepeatTwoAutoAndMaxCont
entTwoOverlapping"> | 93 <div class="grid gridRepeatTwoAutoAndMaxContent justifyContentStart" id="gridRep
eatTwoAutoAndMaxContentTwoOverlapping"> |
| 93 <div class="columns1And2">XXXX XXXX</div> | 94 <div class="columns1And2">XXXX XXXX</div> |
| 94 <div class="columns3And4">XX XX</div> | 95 <div class="columns3And4">XX XX</div> |
| 95 <div class="columns1And2">XXXXX XXX XXXX</div> | 96 <div class="columns1And2">XXXXX XXX XXXX</div> |
| 96 <div class="columns3And4">XXX XX XXX</div> | 97 <div class="columns3And4">XXX XX XXX</div> |
| 97 </div> | 98 </div> |
| 98 | 99 |
| 99 <div class="grid gridRepeatTwoAutoAndMaxContent" id="gridRepeatTwoAutoAndMaxCont
entThreeOverlapping"> | 100 <div class="grid gridRepeatTwoAutoAndMaxContent justifyContentStart" id="gridRep
eatTwoAutoAndMaxContentThreeOverlapping"> |
| 100 <div class="columns2And3">XXXXX XXX XXXX</div> | 101 <div class="columns2And3">XXXXX XXX XXXX</div> |
| 101 <div class="columns3And4">XXX XX XXX</div> | 102 <div class="columns3And4">XXX XX XXX</div> |
| 102 <div class="columns1And2">XXXX XXXX</div> | 103 <div class="columns1And2">XXXX XXXX</div> |
| 103 </div> | 104 </div> |
| 104 | 105 |
| 105 <div class="grid gridRepeatTwoAutoAndMaxContent" id="gridRepeatTwoAutoAndMaxCont
entTwoAndFourOverlapping"> | 106 <div class="grid gridRepeatTwoAutoAndMaxContent justifyContentStart" id="gridRep
eatTwoAutoAndMaxContentTwoAndFourOverlapping"> |
| 106 <div class="columns1To4">XXXX XXXX</div> | 107 <div class="columns1To4">XXXX XXXX</div> |
| 107 <div class="columns3And4">XX XX</div> | 108 <div class="columns3And4">XX XX</div> |
| 108 <div class="columns1To4">XXXXX XXX XXXX</div> | 109 <div class="columns1To4">XXXXX XXX XXXX</div> |
| 109 <div class="columns1And2">XXX XX XXX</div> | 110 <div class="columns1And2">XXX XX XXX</div> |
| 110 <div class="columns3And4">X X X X X</div> | 111 <div class="columns3And4">X X X X X</div> |
| 111 <div class="columns1And2">XXXXXX</div> | 112 <div class="columns1And2">XXXXXX</div> |
| 112 </div> | 113 </div> |
| 113 | 114 |
| 114 <script> | 115 <script> |
| 115 function testGridColumnsValues(id, computedColumnValue) | 116 function testGridColumnsValues(id, computedColumnValue) |
| 116 { | 117 { |
| 117 shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyVa
lue('grid-template-columns')", computedColumnValue); | 118 shouldBeEqualToString("window.getComputedStyle(" + id + ", '').getPropertyVa
lue('grid-template-columns')", computedColumnValue); |
| 118 } | 119 } |
| 119 | 120 |
| 120 debug("Check that tracks are updated after distributing the extra space for all
the items in the same group span."); | 121 debug("Check that tracks are updated after distributing the extra space for all
the items in the same group span."); |
| 121 testGridColumnsValues("gridAutoAndMaxContent", "25px 65px"); | 122 testGridColumnsValues("gridAutoAndMaxContent", "25px 65px"); |
| 122 testGridColumnsValues("gridFixedMinContentAndFixedMaxContent", "25px 85px"); | 123 testGridColumnsValues("gridFixedMinContentAndFixedMaxContent", "25px 85px"); |
| 123 testGridColumnsValues("gridMinContentAndMaxContent", "15px 85px"); | 124 testGridColumnsValues("gridMinContentAndMaxContent", "15px 85px"); |
| 124 testGridColumnsValues("gridMinContentAndFixedAndMaxContent", "15px 20px 105px"); | 125 testGridColumnsValues("gridMinContentAndFixedAndMaxContent", "15px 20px 105px"); |
| 125 testGridColumnsValues("gridMaxContentAndFixedAndAuto", "105px 20px 15px"); | 126 testGridColumnsValues("gridMaxContentAndFixedAndAuto", "105px 20px 15px"); |
| 126 testGridColumnsValues("gridRepeatTwoMaxContentAndMinContentTwoOverlapping", "115
px 25px 85px 15px"); | 127 testGridColumnsValues("gridRepeatTwoMaxContentAndMinContentTwoOverlapping", "115
px 25px 85px 15px"); |
| 127 testGridColumnsValues("gridRepeatTwoMaxContentAndMinContentThreeOverlapping", "6
5px 25px 115px 15px"); | 128 testGridColumnsValues("gridRepeatTwoMaxContentAndMinContentThreeOverlapping", "6
5px 25px 115px 15px"); |
| 128 testGridColumnsValues("gridRepeatTwoMaxContentAndMinContentTwoAndFourOverlapping
", "70px 30px 80px 10px"); | 129 testGridColumnsValues("gridRepeatTwoMaxContentAndMinContentTwoAndFourOverlapping
", "70px 30px 80px 10px"); |
| 129 testGridColumnsValues("gridRepeatTwoAutoAndMaxContentTwoOverlapping", "25px 115p
x 15px 85px"); | 130 testGridColumnsValues("gridRepeatTwoAutoAndMaxContentTwoOverlapping", "25px 115p
x 15px 85px"); |
| 130 testGridColumnsValues("gridRepeatTwoAutoAndMaxContentThreeOverlapping", "20px 11
5px 25px 75px"); | 131 testGridColumnsValues("gridRepeatTwoAutoAndMaxContentThreeOverlapping", "20px 11
5px 25px 75px"); |
| 131 testGridColumnsValues("gridRepeatTwoAutoAndMaxContentTwoAndFourOverlapping", "30
px 70px 10px 80px"); | 132 testGridColumnsValues("gridRepeatTwoAutoAndMaxContentTwoAndFourOverlapping", "30
px 70px 10px 80px"); |
| 132 </script> | 133 </script> |
| 133 </body> | 134 </body> |
| OLD | NEW |