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

Fixes #14888
Closes gh-1536

diff --git a/.mailmap b/.mailmap
index c28005fe0621ddb1d12f8c4f80c3a439e22d72f1..53c5fdab264b6834bc03e7732459886e8067cf19 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -77,6 +77,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 b30e719a986d15a9d8a5dad805ddf25d41cfca8b..0aff9194c0870f743a92f8caecc8b8e2c3ec986e 100644 (file)
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -216,3 +216,4 @@ Jakob Stoeck <jakob@pokermania.de>
 Christopher Jones <chris@cjqed.com>
 Forbes Lindesay <forbes@lindesay.co.uk>
 S. Andrew Sheppard <andrew@wq.io>
+Roman Reiß <me@silverwind.io>

diff --git a/src/css.js b/src/css.js
index 5e22dae00f29da47f1f10165cbcd1370903902be..2a3a84d00bfa35ba9e24290397e7c824f9929388 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -222,6 +222,8 @@ jQuery.extend({
        cssNumber: {
                "columnCount": true,
                "fillOpacity": true,
+               "flexGrow": true,
+               "flexShrink": true,
                "fontWeight": true,
                "lineHeight": true,
                "opacity": true,