From db6dcd695f7c96849bab189f007f5f6603c7e6d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= <paul@oshannessy.com>
Date: Tue, 14 Apr 2015 16:31:13 -0700
Subject: [PATCH] Merge pull request #3485 from jnu/ie10-flex-unitless

Treat flexPositive, flexNegative as unitless styles
---
 docs/tips/06-style-props-value-px.md | 4 ++++
 src/browser/ui/dom/CSSProperty.js    | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/docs/tips/06-style-props-value-px.md b/docs/tips/06-style-props-value-px.md
index aeb2cb3e3f..3f308cbc69 100644
--- a/docs/tips/06-style-props-value-px.md
+++ b/docs/tips/06-style-props-value-px.md
@@ -18,11 +18,15 @@ See [Inline Styles](/react/tips/inline-styles.html) for more info.
 
 Sometimes you _do_ want to keep the CSS properties unitless. Here's a list of properties that won't get the automatic "px" suffix:
 
+- `boxFlex`
+- `boxFlexGroup`
 - `columnCount`
 - `fillOpacity`
 - `flex`
 - `flexGrow`
+- `flexPositive`
 - `flexShrink`
+- `flexNegative`
 - `fontWeight`
 - `lineClamp`
 - `lineHeight`
diff --git a/src/browser/ui/dom/CSSProperty.js b/src/browser/ui/dom/CSSProperty.js
index 93b5468438..3dc5a40e8a 100644
--- a/src/browser/ui/dom/CSSProperty.js
+++ b/src/browser/ui/dom/CSSProperty.js
@@ -20,7 +20,9 @@ var isUnitlessNumber = {
   columnCount: true,
   flex: true,
   flexGrow: true,
+  flexPositive: true,
   flexShrink: true,
+  flexNegative: true,
   fontWeight: true,
   lineClamp: true,
   lineHeight: true,