Merge remote-tracking branch 'refs/remotes/facebook/master' into percentage-feature

# Conflicts: # csharp/Facebook.Yoga/YogaNode.Create.cs
2016-12-19 23:04:15 +01:00
parent e2c586490a 74fb205083
commit 1cb7ca431d
16 changed files with 330 additions and 46 deletions
--- a/csharp/tests/Facebook.Yoga/YogaNodeCreateTest.cs
+++ b/csharp/tests/Facebook.Yoga/YogaNodeCreateTest.cs
@@ -87,12 +87,12 @@ namespace Facebook.Yoga
                padding: new Spacing(top: 13, bottom: 14, left: 15, right: 16),
                border: new Border(top: 17, bottom: 18, left: 19, right: 20),

-                Width: 21,
-                Height: 22,
-                MinWidth: 23,
-                MinHeight: 24,
-                MaxWidth: 25,
-                MaxHeight: 26);
+                width: 21,
+                height: 22,
+                minWidth: 23,
+                minHeight: 24,
+                maxWidth: 25,
+                maxHeight: 26);

            Assert.AreEqual(YogaDirection.RTL, node.StyleDirection);
            Assert.AreEqual(YogaFlexDirection.RowReverse, node.FlexDirection);