Merge "Update from upstream"

2012-11-22 06:06:47 +00:00
parent 51494eace2 630f9d141a
commit 7d1b36487f
1 changed files with 3 additions and 2 deletions
--- a/lib/jquery.webfonts.js
+++ b/lib/jquery.webfonts.js
@@ -99,8 +99,9 @@
 				$element.css( 'font-family', fontStack.join() );
 			}

-			// Set the font of this element's children if they are not excluded
-			$element.find( 'textarea, input' )
+			// Set the font of this element's children if they are not excluded.
+			// font-family of <input>, <textarea> and <button> must be changed explicitly.
+			$element.find( 'textarea, input, button' )
 				.not( this.options.exclude )
 				.css( 'font-family', fontStack.join() );
 		},