Merge branch 'main' of https://github.com/facebook/yoga into emscripten

This commit is contained in:
Nick Gerleman
2022-12-24 01:48:47 -08:00
7 changed files with 565 additions and 2 deletions

View File

@@ -3,10 +3,10 @@ GEM
specs:
childprocess (4.1.0)
mini_portile2 (2.8.0)
nokogiri (1.13.9)
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
racc (1.6.0)
racc (1.6.1)
regexp_parser (2.6.0)
rexml (3.2.5)
rubyzip (2.3.2)

View File

@@ -123,6 +123,12 @@
<div style="min-width: 60px; flex-grow: 1;"></div>
</div>
<div id="column_gap_determines_parent_width" style="flex-direction: row; height: 100px; align-items: 'stretch'; column-gap: 10px;">
<div style="width: 10px;"></div>
<div style="width: 20px;"></div>
<div style="width: 30px;"></div>
</div>
<div id="row_gap_align_items_stretch" style="flex-direction: row; flex-wrap: wrap; width: 100px; height: 200px; column-gap: 10px; row-gap: 20px; align-items:stretch; align-content: stretch">
<div style="width: 20px; "></div>
<div style="width: 20px;"></div>
@@ -152,3 +158,9 @@
<div style="width: 60px; margin-block: 10px;"></div>
<div style="width: 60px; margin-block: 15px;"></div>
</div>
<div id="row_gap_determines_parent_height" style="flex-direction: column; width: 100px; align-items: 'stretch'; row-gap: 10px;">
<div style="height: 10px;"></div>
<div style="height: 20px"></div>
<div style="height: 30px"></div>
</div>