Merge "Update from upstream"

This commit is contained in:
Santhosh authored and Gerrit Code Review committed 2012-11-22 06:06:47 +00:00
commit 7d1b36487f
1 file changed
+3 -2
+3 -2
View File
@@ -99,8 +99,9 @@
$element.css( 'font-family', fontStack.join() ); $element.css( 'font-family', fontStack.join() );
} }
// Set the font of this element's children if they are not excluded // Set the font of this element's children if they are not excluded.
$element.find( 'textarea, input' ) // font-family of <input>, <textarea> and <button> must be changed explicitly.
$element.find( 'textarea, input, button' )
.not( this.options.exclude ) .not( this.options.exclude )
.css( 'font-family', fontStack.join() ); .css( 'font-family', fontStack.join() );
}, },