aboutsummaryrefslogtreecommitdiffstats
path: root/test/data
diff options
context:
space:
mode:
Diffstat (limited to 'test/data')
-rw-r--r--test/data/css/cssWidthBeforeDocReady.html1
-rw-r--r--test/data/dimensions/documentSmall.html10
-rw-r--r--test/data/support/shrinkWrapBlocks.html23
-rw-r--r--test/data/testsuite.css12
4 files changed, 6 insertions, 40 deletions
diff --git a/test/data/css/cssWidthBeforeDocReady.html b/test/data/css/cssWidthBeforeDocReady.html
index 3bdd1b5ab..c45b6811a 100644
--- a/test/data/css/cssWidthBeforeDocReady.html
+++ b/test/data/css/cssWidthBeforeDocReady.html
@@ -5,7 +5,6 @@
<style>
#test {
-webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
box-sizing: border-box;
width: 100px;
height: 100px;
diff --git a/test/data/dimensions/documentSmall.html b/test/data/dimensions/documentSmall.html
index 63e1c2a8f..2f79d7f93 100644
--- a/test/data/dimensions/documentSmall.html
+++ b/test/data/dimensions/documentSmall.html
@@ -2,16 +2,6 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr" id="html">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <style>
- html {
- /**
- * we need to null out border-width, because it causes bug #3838
- * and until we drop IE6, this test will fail in IE6 if we didn't
- * special case this situation.
- **/
- border-width: 0;
- }
- </style>
</head>
<body>
<div>
diff --git a/test/data/support/shrinkWrapBlocks.html b/test/data/support/shrinkWrapBlocks.html
deleted file mode 100644
index d781423ec..000000000
--- a/test/data/support/shrinkWrapBlocks.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr" id="html">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <style>
- * {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- }
- </style>
-</head>
-<body>
- <div>
- <script src="../../jquery.js"></script>
- </div>
- <script>
- jQuery(function() {
- window.parent.iframeCallback( jQuery.support.shrinkWrapBlocks() );
- });
- </script>
-</body>
-</html>
diff --git a/test/data/testsuite.css b/test/data/testsuite.css
index d9909ddcc..de5f3fb00 100644
--- a/test/data/testsuite.css
+++ b/test/data/testsuite.css
@@ -1,7 +1,7 @@
/* for testing opacity set in styles in IE */
ol#empty {
opacity: 0;
- filter:Alpha(opacity=0) progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffff0000', EndColorStr='#ffffffff');
+ -ms-filter: "Alpha(opacity=0) progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffff0000', EndColorStr='#ffffffff')";
}
div#fx-tests h4 {
@@ -47,7 +47,7 @@ div.largeheight {
}
div.largeopacity {
- filter: progid:DXImageTransform.Microsoft.Alpha(opacity=100);
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=100)";
}
div.medwidth {
@@ -60,7 +60,7 @@ div.medheight {
div.medopacity {
opacity: 0.5;
- filter: progid:DXImageTransform.Microsoft.Alpha(opacity=50);
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=50)";
}
div.nowidth {
@@ -73,7 +73,7 @@ div.noheight {
div.noopacity {
opacity: 0;
- filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=0)";
}
div.hidden {
@@ -143,8 +143,8 @@ dfn { display: none; }
/* #9239 Attach a background to the body( avoid crashes in removing the test element in support ) */
body, div { background: url(http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif) no-repeat -1000px 0; }
-/* #6652 REMOVE FILTER:ALPHA(OPACITY=100) AFTER ANIMATION */
-#t6652 div { filter: alpha(opacity=50); }
+/* #6652 Remove -ms-filter: "alpha(opacity=100)" after animation */
+#t6652 div { -ms-filter: "alpha(opacity=50)"; }
/* #10501 */
section { background:#f0f; display:block; }