From c7fbf44474a08b7343817d20a01a84cc80fe2526 Mon Sep 17 00:00:00 2001
From: Pierre Renaux <pierre@talansoft.com>
Date: Sat, 9 May 2015 11:58:02 +0800
Subject: [PATCH] 'alignContent' defaults to 'flex-start' instead of 'stretch'
 ;

---
 src/Layout-test-utils.js                          | 4 ++--
 src/Layout.c                                      | 2 +-
 src/Layout.js                                     | 2 +-
 src/java/src/com/facebook/csslayout/CSSStyle.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Layout-test-utils.js b/src/Layout-test-utils.js
index 7edf6905..2eaa18e6 100644
--- a/src/Layout-test-utils.js
+++ b/src/Layout-test-utils.js
@@ -371,13 +371,13 @@ var layoutTestUtils = (function() {
     div.style.display = 'flex';
     div.style.flexDirection = 'column';
     div.style.alignItems = 'flex-start';
-    div.style.alignContent = 'stretch';
+    div.style.alignContent = 'flex-start';
 
     var span = document.createElement('span');
     span.style.display = 'flex';
     span.style.flexDirection = 'column';
     span.style.alignItems = 'flex-start';
-    span.style.alignContent = 'stretch';
+    span.style.alignContent = 'flex-start';
     span.innerText = text;
 
     div.appendChild(span);
diff --git a/src/Layout.c b/src/Layout.c
index de0788f9..7694aed1 100644
--- a/src/Layout.c
+++ b/src/Layout.c
@@ -35,7 +35,7 @@ static bool eq(float a, float b) {
 
 void init_css_node(css_node_t *node) {
   node->style.align_items = CSS_ALIGN_STRETCH;
-  node->style.align_content = CSS_ALIGN_STRETCH;
+  node->style.align_content = CSS_ALIGN_FLEX_START;
 
   // Some of the fields default to undefined and not 0
   node->style.dimensions[CSS_WIDTH] = CSS_UNDEFINED;
diff --git a/src/Layout.js b/src/Layout.js
index 42c3657d..099ba315 100755
--- a/src/Layout.js
+++ b/src/Layout.js
@@ -148,7 +148,7 @@ var computeLayout = (function() {
     if ('alignContent' in node.style) {
       return node.style.alignContent;
     }
-    return 'stretch';
+    return 'flex-start';
   }
 
   function getAlignItem(node, child) {
diff --git a/src/java/src/com/facebook/csslayout/CSSStyle.java b/src/java/src/com/facebook/csslayout/CSSStyle.java
index 64c67fc2..72e807bc 100644
--- a/src/java/src/com/facebook/csslayout/CSSStyle.java
+++ b/src/java/src/com/facebook/csslayout/CSSStyle.java
@@ -15,7 +15,7 @@ public class CSSStyle {
 
   public CSSFlexDirection flexDirection = CSSFlexDirection.COLUMN;
   public CSSJustify justifyContent = CSSJustify.FLEX_START;
-  public CSSAlign alignContent = CSSAlign.STRETCH;
+  public CSSAlign alignContent = CSSAlign.FLEX_START;
   public CSSAlign alignItems = CSSAlign.STRETCH;
   public CSSAlign alignSelf = CSSAlign.AUTO;
   public CSSPositionType positionType = CSSPositionType.RELATIVE;