CSS: Add flex-grow and flex-shrink to cssNumber

Fixes #14888
Closes gh-1536
(cherry picked from commit c29e9c4db18738f7bfeb6b4a8019121a9079beb6)

diff --git a/.mailmap b/.mailmap
index 576f2fb4ce58a2b111ffe7f58093e41f22a2baa5..1b7dcf677017fe960ed7306aaa970a9d6f58e79f 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -72,6 +72,7 @@ Richard D. Worth <rdworth@gmail.com>
 Rick Waldron <waldron.rick@gmail.com>
 Rick Waldron <waldron.rick@gmail.com> <rick@bocoup.com>
 Robert Katić <robert.katic@gmail.com>
+Roman Reiß <me@silverwind.io>
 Ron Otten <r.j.g.otten@gmail.com>
 Sai Lung Wong <sai.wong@huffingtonpost.com>
 Scott González <scott.gonzalez@gmail.com> <sgonzale@sgonzale-laptop.local>

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 07fb5710d27b5f452811eb45db8681344b813eb6..9c734c4efc0a10b88d2ac7361e95ee0876db8fe5 100644 (file)
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -207,3 +207,4 @@ cjqed <christopherjonesqed@gmail.com>
 Forbes Lindesay <forbes@lindesay.co.uk>
 John Paul <john@johnkpaul.com>
 S. Andrew Sheppard <andrew@wq.io>
+Roman Reiß <me@silverwind.io>

diff --git a/src/css.js b/src/css.js
index dcca4e953d8e500d2bde2f8965cb4c89e6f5a2f1..1e454caf1d06cbbc44ced2123302a8e3e47a0c80 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -227,6 +227,8 @@ jQuery.extend({
        cssNumber: {
                "columnCount": true,
                "fillOpacity": true,
+               "flexGrow": true,
+               "flexShrink": true,
                "fontWeight": true,
                "lineHeight": true,
                "opacity": true,