From c29e9c4db18738f7bfeb6b4a8019121a9079beb6 Mon Sep 17 00:00:00 2001 From: Roman Rei_ Date: Mon, 10 Mar 2014 19:30:22 +0100 Subject: [PATCH] CSS: Add flex-grow and flex-shrink to cssNumber Fixes #14888 Closes gh-1536 --- .mailmap | 1 + AUTHORS.txt | 1 + src/css.js | 2 ++ 3 files changed, 4 insertions(+) diff --git a/.mailmap b/.mailmap index c28005fe0..53c5fdab2 100644 --- a/.mailmap +++ b/.mailmap @@ -77,6 +77,7 @@ Richard D. Worth Rick Waldron Rick Waldron Robert Katić +Roman Reiß Ron Otten Sai Lung Wong Scott González diff --git a/AUTHORS.txt b/AUTHORS.txt index b30e719a9..0aff9194c 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -216,3 +216,4 @@ Jakob Stoeck Christopher Jones Forbes Lindesay S. Andrew Sheppard +Roman Reiß diff --git a/src/css.js b/src/css.js index 5e22dae00..2a3a84d00 100644 --- 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, -- 2.39.5