DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

[Issue facebook/css-layout#78]: Implemented alignContent ; #79

Merged
prenaux merged 15 commits from master into master 2015-05-17 08:58:05 -07:00
Conversation 13 Commits 15 Files Changed 17 +1983 -8238
19 changed files with 1983 additions and 8238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9ca681ff28 - Show all commits

3
src/Layout-test-utils.js
View File

@@ -201,6 +201,7 @@ var layoutTestUtils = (function() {
transfer(div, node, 'justifyContent');
transfer(div, node, 'alignSelf');
transfer(div, node, 'alignItems');
transfer(div, node, 'alignContent');
transfer(div, node, 'position');
parent.appendChild(div);
(node.children || []).forEach(function(child) {
@@ -370,11 +371,13 @@ var layoutTestUtils = (function() {
div.style.display = 'flex';
div.style.flexDirection = 'column';
div.style.alignItems = 'flex-start';
div.style.alignContent = 'stretch';
var span = document.createElement('span');
span.style.display = 'flex';
span.style.flexDirection = 'column';
span.style.alignItems = 'flex-start';
span.style.alignContent = 'stretch';
span.innerText = text;
div.appendChild(span);

1
src/__tests__/Layout-random-test.js
View File

@@ -65,6 +65,7 @@ describe('Random layout', function() {
randEnum(node, 0.5, 'justifyContent', ['flex-start', 'center', 'flex-end', 'space-between', 'space-around']);
randEnum(node, 0.5, 'alignItems', ['flex-start', 'center', 'flex-end', 'stretch']);
randEnum(node, 0.5, 'alignSelf', ['flex-start', 'center', 'flex-end', 'stretch']);
randEnum(node, 0.5, 'alignContent', ['flex-start', 'center', 'flex-end', 'stretch']);
randEnum(node, 0.5, 'position', ['relative', 'absolute']);
randEnum(node, 0.5, 'flexWrap', ['nowrap', 'wrap']);
//randEnum(node, 0.5, 'measure', [text(texts.small), text(texts.big)]);