diff options
| author | jeresig <jeresig@gmail.com> | 2011-04-14 15:57:47 -0400 |
|---|---|---|
| committer | jeresig <jeresig@gmail.com> | 2011-04-14 15:57:47 -0400 |
| commit | 1dda994c463f01977c7126407998d61efed218a5 (patch) | |
| tree | 5b53afa6b5bb05d7ed9fc68ed5eae4c442e15466 /test/data | |
| parent | 84712bd624a9a4eeaab9ea9c543bba494f2cc3e1 (diff) | |
| parent | a76decc47660591bb807aecf56825019da8b39fa (diff) | |
| download | jquery-1dda994c463f01977c7126407998d61efed218a5.tar.gz jquery-1dda994c463f01977c7126407998d61efed218a5.zip | |
Merge branch '8099' of https://github.com/rwldrn/jquery. Fixes #8099.
Conflicts:
test/data/testsuite.css
Diffstat (limited to 'test/data')
| -rw-r--r-- | test/data/testsuite.css | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/data/testsuite.css b/test/data/testsuite.css index a9dd97ba4..99851eaa5 100644 --- a/test/data/testsuite.css +++ b/test/data/testsuite.css @@ -111,4 +111,9 @@ div#show-tests * { display: none; } #nothiddendivchild.prct { font-size: 150%; } /* For testing type on vml in IE #7071 */ -v\:oval { behavior:url(#default#VML); display:inline-block; }
\ No newline at end of file +v\:oval { behavior:url(#default#VML); display:inline-block; } + +/* 8099 changes to default styles are read correctly */ +tt { display: none; } +sup { display: none; } +dfn { display: none; } |