| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <html> | 2 <html> |
| 3 <head> | 3 <head> |
| 4 <link href="resources/grid.css" rel="stylesheet"> | 4 <link href="resources/grid.css" rel="stylesheet"> |
| 5 <link href="resources/grid-alignment.css" rel="stylesheet"> |
| 5 <script src="../../resources/check-layout.js"></script> | 6 <script src="../../resources/check-layout.js"></script> |
| 6 <style> | 7 <style> |
| 7 body { | 8 body { |
| 8 margin: 0px; | 9 margin: 0px; |
| 9 } | 10 } |
| 10 | 11 |
| 11 .grid { | 12 .grid { |
| 12 grid-auto-columns: 20px; | 13 grid-auto-columns: 20px; |
| 13 grid-auto-rows: 40px; | 14 grid-auto-rows: 40px; |
| 14 grid-template-areas: "a a b" | 15 grid-template-areas: "a a b" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 30 background-color: purple; | 31 background-color: purple; |
| 31 } | 32 } |
| 32 .d { | 33 .d { |
| 33 grid-area: d; | 34 grid-area: d; |
| 34 background-color: orange; | 35 background-color: orange; |
| 35 } | 36 } |
| 36 .stretchedGrid { | 37 .stretchedGrid { |
| 37 grid-auto-columns: auto; | 38 grid-auto-columns: auto; |
| 38 grid-auto-rows: auto; | 39 grid-auto-rows: auto; |
| 39 } | 40 } |
| 40 | |
| 41 .spaceBetween { | |
| 42 justify-content: space-between; | |
| 43 align-content: space-between; | |
| 44 } | |
| 45 | |
| 46 .spaceAround { | |
| 47 justify-content: space-around; | |
| 48 align-content: space-around; | |
| 49 } | |
| 50 | |
| 51 .spaceEvenly { | |
| 52 justify-content: space-evenly; | |
| 53 align-content: space-evenly; | |
| 54 } | |
| 55 | |
| 56 .stretch { | |
| 57 justify-content: stretch; | |
| 58 align-content: stretch; | |
| 59 } | |
| 60 </style> | 41 </style> |
| 61 </head> | 42 </head> |
| 62 <body onload="checkLayout('.grid')"> | 43 <body onload="checkLayout('.grid')"> |
| 63 | 44 |
| 64 <p>This test checks that Content Distribution alignment is applied correctly whe
n items span more than one track.</p> | 45 <p>This test checks that Content Distribution alignment is applied correctly whe
n items span more than one track.</p> |
| 65 | 46 |
| 66 <div style="position: relative"> | 47 <div style="position: relative"> |
| 67 <p>direction: LTR | distribution: 'space-between'</p> | 48 <p>direction: LTR | distribution: 'space-between'</p> |
| 68 <div class="grid spaceBetween" data-expected-width="300" data-expected-heigh
t="200"> | 49 <div class="grid contentSpaceBetween" data-expected-width="300" data-expecte
d-height="200"> |
| 69 <div class="a" data-offset-x="0" data-offset-y="0" data-expected-width="
160" data-expected-height="40"></div> | 50 <div class="a" data-offset-x="0" data-offset-y="0" data-expected-width="
160" data-expected-height="40"></div> |
| 70 <div class="b" data-offset-x="280" data-offset-y="0" data-expected-width
="20" data-expected-height="200"></div> | 51 <div class="b" data-offset-x="280" data-offset-y="0" data-expected-width
="20" data-expected-height="200"></div> |
| 71 <div class="c" data-offset-x="0" data-offset-y="160" data-expected-width
="20" data-expected-height="40"></div> | 52 <div class="c" data-offset-x="0" data-offset-y="160" data-expected-width
="20" data-expected-height="40"></div> |
| 72 <div class="d" data-offset-x="140" data-offset-y="160" data-expected-wid
th="20" data-expected-height="40"></div> | 53 <div class="d" data-offset-x="140" data-offset-y="160" data-expected-wid
th="20" data-expected-height="40"></div> |
| 73 </div> | 54 </div> |
| 74 </div> | 55 </div> |
| 75 | 56 |
| 76 <div style="position: relative"> | 57 <div style="position: relative"> |
| 77 <p>direction: LTR | distribution: 'space-around'</p> | 58 <p>direction: LTR | distribution: 'space-around'</p> |
| 78 <div class="grid spaceAround" data-expected-width="300" data-expected-height
="200"> | 59 <div class="grid contentSpaceAround" data-expected-width="300" data-expected
-height="200"> |
| 79 <div class="a" data-offset-x="40" data-offset-y="30" data-expected-width
="120" data-expected-height="40"></div> | 60 <div class="a" data-offset-x="40" data-offset-y="30" data-expected-width
="120" data-expected-height="40"></div> |
| 80 <div class="b" data-offset-x="240" data-offset-y="30" data-expected-widt
h="20" data-expected-height="140"></div> | 61 <div class="b" data-offset-x="240" data-offset-y="30" data-expected-widt
h="20" data-expected-height="140"></div> |
| 81 <div class="c" data-offset-x="40" data-offset-y="130" data-expected-widt
h="20" data-expected-height="40"></div> | 62 <div class="c" data-offset-x="40" data-offset-y="130" data-expected-widt
h="20" data-expected-height="40"></div> |
| 82 <div class="d" data-offset-x="140" data-offset-y="130" data-expected-wid
th="20" data-expected-height="40"></div> | 63 <div class="d" data-offset-x="140" data-offset-y="130" data-expected-wid
th="20" data-expected-height="40"></div> |
| 83 </div> | 64 </div> |
| 84 </div> | 65 </div> |
| 85 | 66 |
| 86 <div style="position: relative"> | 67 <div style="position: relative"> |
| 87 <p>direction: LTR | distribution: 'space-evenly'</p> | 68 <p>direction: LTR | distribution: 'space-evenly'</p> |
| 88 <div class="grid spaceEvenly" data-expected-width="300" data-expected-height
="200"> | 69 <div class="grid contentSpaceEvenly" data-expected-width="300" data-expected
-height="200"> |
| 89 <div class="a" data-offset-x="60" data-offset-y="40" data-expected-width
="100" data-expected-height="40"></div> | 70 <div class="a" data-offset-x="60" data-offset-y="40" data-expected-width
="100" data-expected-height="40"></div> |
| 90 <div class="b" data-offset-x="220" data-offset-y="40" data-expected-widt
h="20" data-expected-height="120"></div> | 71 <div class="b" data-offset-x="220" data-offset-y="40" data-expected-widt
h="20" data-expected-height="120"></div> |
| 91 <div class="c" data-offset-x="60" data-offset-y="120" data-expected-widt
h="20" data-expected-height="40"></div> | 72 <div class="c" data-offset-x="60" data-offset-y="120" data-expected-widt
h="20" data-expected-height="40"></div> |
| 92 <div class="d" data-offset-x="140" data-offset-y="120" data-expected-wid
th="20" data-expected-height="40"></div> | 73 <div class="d" data-offset-x="140" data-offset-y="120" data-expected-wid
th="20" data-expected-height="40"></div> |
| 93 </div> | 74 </div> |
| 94 </div> | 75 </div> |
| 95 | 76 |
| 96 <div style="position: relative"> | 77 <div style="position: relative"> |
| 97 <p>direction: LTR | distribution: 'stretch'</p> | 78 <p>direction: LTR | distribution: 'stretch'</p> |
| 98 <div class="grid stretchedGrid stretch" data-expected-width="300" data-expec
ted-height="200"> | 79 <div class="grid stretchedGrid contentStretch" data-expected-width="300" dat
a-expected-height="200"> |
| 99 <div class="a" data-offset-x="0" data-offset-y="0" data-expected-width="
200" data-expected-height="100"></div> | 80 <div class="a" data-offset-x="0" data-offset-y="0" data-expected-width="
200" data-expected-height="100"></div> |
| 100 <div class="b" data-offset-x="200" data-offset-y="0" data-expected-width
="100" data-expected-height="200"></div> | 81 <div class="b" data-offset-x="200" data-offset-y="0" data-expected-width
="100" data-expected-height="200"></div> |
| 101 <div class="c" data-offset-x="0" data-offset-y="100" data-expected-width
="100" data-expected-height="100"></div> | 82 <div class="c" data-offset-x="0" data-offset-y="100" data-expected-width
="100" data-expected-height="100"></div> |
| 102 <div class="d" data-offset-x="100" data-offset-y="100" data-expected-wid
th="100" data-expected-height="100"></div> | 83 <div class="d" data-offset-x="100" data-offset-y="100" data-expected-wid
th="100" data-expected-height="100"></div> |
| 103 </div> | 84 </div> |
| 104 </div> | 85 </div> |
| 105 | 86 |
| 106 <!-- RTL direction. --> | 87 <!-- RTL direction. --> |
| 107 <div style="position: relative"> | 88 <div style="position: relative"> |
| 108 <p>direction: RTL | distribution: 'space-between'</p> | 89 <p>direction: RTL | distribution: 'space-between'</p> |
| 109 <div class="grid spaceBetween directionRTL" data-expected-width="300" data-e
xpected-height="200"> | 90 <div class="grid contentSpaceBetween directionRTL" data-expected-width="300"
data-expected-height="200"> |
| 110 <div class="a" data-offset-x="140" data-offset-y="0" data-expected-width
="160" data-expected-height="40"></div> | 91 <div class="a" data-offset-x="140" data-offset-y="0" data-expected-width
="160" data-expected-height="40"></div> |
| 111 <div class="b" data-offset-x="0" data-offset-y="0" data-expected-width="
20" data-expected-height="200"></div> | 92 <div class="b" data-offset-x="0" data-offset-y="0" data-expected-width="
20" data-expected-height="200"></div> |
| 112 <div class="c" data-offset-x="280" data-offset-y="160" data-expected-wid
th="20" data-expected-height="40"></div> | 93 <div class="c" data-offset-x="280" data-offset-y="160" data-expected-wid
th="20" data-expected-height="40"></div> |
| 113 <div class="d" data-offset-x="140" data-offset-y="160" data-expected-wid
th="20" data-expected-height="40"></div> | 94 <div class="d" data-offset-x="140" data-offset-y="160" data-expected-wid
th="20" data-expected-height="40"></div> |
| 114 </div> | 95 </div> |
| 115 </div> | 96 </div> |
| 116 | 97 |
| 117 <div style="position: relative"> | 98 <div style="position: relative"> |
| 118 <p>direction: RTL | distribution: 'space-around'</p> | 99 <p>direction: RTL | distribution: 'space-around'</p> |
| 119 <div class="grid spaceAround directionRTL" data-expected-width="300" data-ex
pected-height="200"> | 100 <div class="grid contentSpaceAround directionRTL" data-expected-width="300"
data-expected-height="200"> |
| 120 <div class="a" data-offset-x="140" data-offset-y="30" data-expected-widt
h="120" data-expected-height="40"></div> | 101 <div class="a" data-offset-x="140" data-offset-y="30" data-expected-widt
h="120" data-expected-height="40"></div> |
| 121 <div class="b" data-offset-x="40" data-offset-y="30" data-expected-width
="20" data-expected-height="140"></div> | 102 <div class="b" data-offset-x="40" data-offset-y="30" data-expected-width
="20" data-expected-height="140"></div> |
| 122 <div class="c" data-offset-x="240" data-offset-y="130" data-expected-wid
th="20" data-expected-height="40"></div> | 103 <div class="c" data-offset-x="240" data-offset-y="130" data-expected-wid
th="20" data-expected-height="40"></div> |
| 123 <div class="d" data-offset-x="140" data-offset-y="130" data-expected-wid
th="20" data-expected-height="40"></div> | 104 <div class="d" data-offset-x="140" data-offset-y="130" data-expected-wid
th="20" data-expected-height="40"></div> |
| 124 </div> | 105 </div> |
| 125 </div> | 106 </div> |
| 126 | 107 |
| 127 <div style="position: relative"> | 108 <div style="position: relative"> |
| 128 <p>direction: RTL | distribution: 'space-evenly''</p> | 109 <p>direction: RTL | distribution: 'space-evenly''</p> |
| 129 <div class="grid spaceEvenly directionRTL" data-expected-width="300" data-ex
pected-height="200"> | 110 <div class="grid contentSpaceEvenly directionRTL" data-expected-width="300"
data-expected-height="200"> |
| 130 <div class="a" data-offset-x="140" data-offset-y="40" data-expected-widt
h="100" data-expected-height="40"></div> | 111 <div class="a" data-offset-x="140" data-offset-y="40" data-expected-widt
h="100" data-expected-height="40"></div> |
| 131 <div class="b" data-offset-x="60" data-offset-y="40" data-expected-width
="20" data-expected-height="120"></div> | 112 <div class="b" data-offset-x="60" data-offset-y="40" data-expected-width
="20" data-expected-height="120"></div> |
| 132 <div class="c" data-offset-x="220" data-offset-y="120" data-expected-wid
th="20" data-expected-height="40"></div> | 113 <div class="c" data-offset-x="220" data-offset-y="120" data-expected-wid
th="20" data-expected-height="40"></div> |
| 133 <div class="d" data-offset-x="140" data-offset-y="120" data-expected-wid
th="20" data-expected-height="40"></div> | 114 <div class="d" data-offset-x="140" data-offset-y="120" data-expected-wid
th="20" data-expected-height="40"></div> |
| 134 </div> | 115 </div> |
| 135 </div> | 116 </div> |
| 136 | 117 |
| 137 <div style="position: relative"> | 118 <div style="position: relative"> |
| 138 <p>direction: RTL | distribution: 'stretch'</p> | 119 <p>direction: RTL | distribution: 'stretch'</p> |
| 139 <div class="grid stretchedGrid stretch directionRTL" data-expected-width="30
0" data-expected-height="200"> | 120 <div class="grid stretchedGrid contentStretch directionRTL" data-expected-wi
dth="300" data-expected-height="200"> |
| 140 <div class="a" data-offset-x="100" data-offset-y="0" data-expected-width
="200" data-expected-height="100"></div> | 121 <div class="a" data-offset-x="100" data-offset-y="0" data-expected-width
="200" data-expected-height="100"></div> |
| 141 <div class="b" data-offset-x="0" data-offset-y="0" data-expected-width="
100" data-expected-height="200"></div> | 122 <div class="b" data-offset-x="0" data-offset-y="0" data-expected-width="
100" data-expected-height="200"></div> |
| 142 <div class="c" data-offset-x="200" data-offset-y="100" data-expected-wid
th="100" data-expected-height="100"></div> | 123 <div class="c" data-offset-x="200" data-offset-y="100" data-expected-wid
th="100" data-expected-height="100"></div> |
| 143 <div class="d" data-offset-x="100" data-offset-y="100" data-expected-wid
th="100" data-expected-height="100"></div> | 124 <div class="d" data-offset-x="100" data-offset-y="100" data-expected-wid
th="100" data-expected-height="100"></div> |
| 144 </div> | 125 </div> |
| 145 </div> | 126 </div> |
| 146 | 127 |
| 147 </body> | 128 </body> |
| 148 </html> | 129 </html> |
| OLD | NEW |