aboutsummaryrefslogtreecommitdiff
path: root/js/tests/visual
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-11-09 22:02:53 -0800
committerMark Otto <[email protected]>2014-11-09 22:02:53 -0800
commit86af1f39abbff7ef06b94d23951408ca27f81cdc (patch)
treefdd71d469877a0fdfcaa8ab3d6994463240c40c4 /js/tests/visual
parent9796f56fa175c41582793a87a1c7eab0f8db1209 (diff)
parentd1278efcc5a6b45467caca15206bb1a83ae99fc5 (diff)
downloadbootstrap-86af1f39abbff7ef06b94d23951408ca27f81cdc.tar.xz
bootstrap-86af1f39abbff7ef06b94d23951408ca27f81cdc.zip
Merge branch 'master' into derp
Conflicts: Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/_includes/components/button-groups.html docs/_includes/components/jumbotron.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/customizer-variables.html docs/_includes/footer.html docs/_includes/getting-started/browser-device-support.html docs/_includes/js/carousel.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/_includes/nav/getting-started.html docs/_includes/nav/javascript.html docs/_layouts/default.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/docs.min.js docs/assets/js/raw-files.min.js docs/browser-bugs.html docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/examples/justified-nav/index.html less/_forms.less less/_tooltip.less less/navs.less less/theme.less
Diffstat (limited to 'js/tests/visual')
-rw-r--r--js/tests/visual/affix.html12
-rw-r--r--js/tests/visual/alert.html12
-rw-r--r--js/tests/visual/button.html12
-rw-r--r--js/tests/visual/carousel.html12
-rw-r--r--js/tests/visual/collapse.html12
-rw-r--r--js/tests/visual/dropdown.html12
-rw-r--r--js/tests/visual/modal.html12
-rw-r--r--js/tests/visual/popover.html12
-rw-r--r--js/tests/visual/scrollspy.html15
-rw-r--r--js/tests/visual/tab.html16
-rw-r--r--js/tests/visual/tooltip.html12
11 files changed, 126 insertions, 13 deletions
diff --git a/js/tests/visual/affix.html b/js/tests/visual/affix.html
index 40a55ab51..4d772dc73 100644
--- a/js/tests/visual/affix.html
+++ b/js/tests/visual/affix.html
@@ -1,8 +1,11 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Affix</title>
- <link rel="stylesheet" type="text/css" href="../../../dist/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
<style>
/* Test Styles */
@@ -37,6 +40,13 @@
background-color: #85144B;
}
</style>
+
+ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body>
diff --git a/js/tests/visual/alert.html b/js/tests/visual/alert.html
index 688e6362c..0070315a2 100644
--- a/js/tests/visual/alert.html
+++ b/js/tests/visual/alert.html
@@ -1,8 +1,18 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Alert</title>
- <link rel="stylesheet" type="text/css" href="../../../dist/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body>
diff --git a/js/tests/visual/button.html b/js/tests/visual/button.html
index 01c7dd4b3..d92a08329 100644
--- a/js/tests/visual/button.html
+++ b/js/tests/visual/button.html
@@ -1,8 +1,18 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Button</title>
- <link rel="stylesheet" type="text/css" href="../../../dist/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body>
diff --git a/js/tests/visual/carousel.html b/js/tests/visual/carousel.html
index aaf48b059..8dede0921 100644
--- a/js/tests/visual/carousel.html
+++ b/js/tests/visual/carousel.html
@@ -1,8 +1,18 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Carousel</title>
- <link rel="stylesheet" type="text/css" href="../../../dist/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body>
diff --git a/js/tests/visual/collapse.html b/js/tests/visual/collapse.html
index 792ba796d..b7a151516 100644
--- a/js/tests/visual/collapse.html
+++ b/js/tests/visual/collapse.html
@@ -1,8 +1,18 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Collapse</title>
- <link rel="stylesheet" type="text/css" href="../../../dist/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body>
diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html
index 6c7f52b2f..02090b6cc 100644
--- a/js/tests/visual/dropdown.html
+++ b/js/tests/visual/dropdown.html
@@ -1,8 +1,18 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Dropdown</title>
- <link rel="stylesheet" type="text/css" href="../../../dist/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body>
diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index f4f61f47f..0af79cc55 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -1,8 +1,18 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Modal</title>
- <link rel="stylesheet" type="text/css" href="../../../dist/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body>
diff --git a/js/tests/visual/popover.html b/js/tests/visual/popover.html
index c09739ff9..0e84f5cee 100644
--- a/js/tests/visual/popover.html
+++ b/js/tests/visual/popover.html
@@ -1,8 +1,18 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Popover</title>
- <link rel="stylesheet" type="text/css" href="../../../dist/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body>
diff --git a/js/tests/visual/scrollspy.html b/js/tests/visual/scrollspy.html
index 2611337f5..5952b7e59 100644
--- a/js/tests/visual/scrollspy.html
+++ b/js/tests/visual/scrollspy.html
@@ -1,11 +1,22 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Scrollspy</title>
- <link rel="stylesheet" type="text/css" href="../../../dist/css/bootstrap.min.css">
- <style type="text/css">
+ <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+ <style>
body { padding-top: 70px; }
</style>
+
+ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body data-spy="scroll" data-target=".navbar" data-offset="70">
diff --git a/js/tests/visual/tab.html b/js/tests/visual/tab.html
index 28757df6e..a3fed1e9f 100644
--- a/js/tests/visual/tab.html
+++ b/js/tests/visual/tab.html
@@ -1,16 +1,28 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Tab</title>
- <link rel="stylesheet" type="text/css" href="../../../dist/css/bootstrap.min.css">
- <style type="text/css">
+ <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+ <style>
h4 {
margin: 40px 0 10px;
}
+
.nav-tabs {
margin-bottom: 15px;
}
</style>
+
+ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body>
diff --git a/js/tests/visual/tooltip.html b/js/tests/visual/tooltip.html
index aaf4b767d..8d10871c9 100644
--- a/js/tests/visual/tooltip.html
+++ b/js/tests/visual/tooltip.html
@@ -1,8 +1,18 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Tooltip</title>
- <link rel="stylesheet" type="text/css" href="../../../dist/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css">
+
+ <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body>