diff options
author | Roman Rei_ <me@silverwind.io> | 2014-03-10 19:30:22 +0100 |
---|---|---|
committer | Dave Methvin <dave.methvin@gmail.com> | 2014-03-13 23:12:40 -0400 |
commit | c29e9c4db18738f7bfeb6b4a8019121a9079beb6 (patch) | |
tree | db7672964dedadc26dc193cb3f06a7d92f3010b4 | |
parent | 594687abdcd8427df1face9466ebff7f04b36fc6 (diff) | |
download | jquery-c29e9c4db18738f7bfeb6b4a8019121a9079beb6.tar.gz jquery-c29e9c4db18738f7bfeb6b4a8019121a9079beb6.zip |
CSS: Add flex-grow and flex-shrink to cssNumber
Fixes #14888
Closes gh-1536
-rw-r--r-- | .mailmap | 1 | ||||
-rw-r--r-- | AUTHORS.txt | 1 | ||||
-rw-r--r-- | src/css.js | 2 |
3 files changed, 4 insertions, 0 deletions
@@ -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 b30e719a9..0aff9194c 100644 --- 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 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, |